[SCM] easytag/master: Imported Upstream version 2.3.5
amigadave-guest at users.alioth.debian.org
amigadave-guest at users.alioth.debian.org
Thu Mar 12 10:02:45 UTC 2015
The following commit has been merged in the master branch:
commit 300f448a5fbbb9867409a7667c2bdb867cd55850
Author: David King <amigadave at amigadave.com>
Date: Thu Mar 12 09:56:20 2015 +0000
Imported Upstream version 2.3.5
diff --git a/ChangeLog b/ChangeLog
index ad172c9..e210a8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,766 @@
+commit f73e12fe96b66cc36470acc39d88a23b96744a37
+Author: David King <amigadave at amigadave.com>
+Date: Mon Mar 9 23:20:28 2015 +0000
+
+ Update NEWS for 2.3.5 release
+
+M NEWS
+M SOURCES
+M configure.ac
+
+commit bba87b66f8ee584630965a55496905ea56535a1e
+Author: Marek Černocký <marek at manet.cz>
+Date: Sun Mar 1 19:31:26 2015 +0100
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit 17491cdbbfc022c15cb98db4cacaaff9a029d1a3
+Author: David King <amigadave at amigadave.com>
+Date: Mon Feb 23 21:14:16 2015 +0000
+
+ Add bug reference to File_Tag test
+
+M tests/test-file_tag.c
+
+commit 3fc01f03d7730524cf02ede2e9adcf1f5df70dde
+Author: David King <amigadave at amigadave.com>
+Date: Mon Feb 23 19:04:04 2015 +0000
+
+ Use versioning guards for tests
+
+ Simplify test declaration by factoring out the common variables,
+ and add
+ the versioning guards to those.
+
+M Makefile.am
+
+commit 1eca256c4f4b67d38c4dcdb93a658e9f9f26edf9
+Author: David King <amigadave at amigadave.com>
+Date: Mon Feb 23 18:53:10 2015 +0000
+
+ Reinstate versioning guards for GLib and GTK+
+
+ These were accidentally dropped when migrating to AX_COMPILER_FLAGS.
+
+M Makefile.am
+M configure.ac
+
+commit 89e7cb0190ff6970987bd6be6795bd936f5edf30
+Author: David King <amigadave at amigadave.com>
+Date: Sun Feb 22 16:08:12 2015 +0000
+
+ Remove some unnecessary finalize() overrides
+
+M src/load_files_dialog.c
+M src/playlist_dialog.c
+M src/preferences_dialog.c
+M src/search_dialog.c
+
+commit 57512213ef1cb3a708fafadefaaf0294aee1bf53
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: Sun Feb 22 20:46:45 2015 +0100
+
+ Updated Polish translation
+
+M po/pl.po
+
+commit 9ae72de9596dbe5715a949912fed73b1d626d80a
+Author: David King <amigadave at amigadave.com>
+Date: Sun Feb 22 13:29:58 2015 +0000
+
+ Add a test for et_file_tag_copy_other_into()
+
+M src/file_tag.c
+M tests/test-file_tag.c
+
+commit 678d0b977387d32951d08f5fcc7d1569ce6ba328
+Author: Ting-Wei Lan <lantw at src.gnome.org>
+Date: Sun Feb 22 12:51:21 2015 +0800
+
+ Fix "void function should not return a value"
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=744928
+
+M src/application_window.c
+
+commit aba60f35e96ecfbc5a5b4c9ccb834aeed670bfdc
+Author: David King <amigadave at amigadave.com>
+Date: Sun Feb 22 12:43:19 2015 +0000
+
+ Fix a memory leak when freeing the history list
+
+M src/file_list.c
+
+commit f3f403cd4e2168f4bbc1fb650357c3ea73102ff5
+Author: David King <amigadave at amigadave.com>
+Date: Sun Feb 22 12:14:28 2015 +0000
+
+ Fix memory leak in et_file_list_add()
+
+M src/file_list.c
+
+commit f899d24f97e770dc6188367d0cff08fe849baa8d
+Author: David King <amigadave at amigadave.com>
+Date: Sun Feb 22 11:58:01 2015 +0000
+
+ Avoid some unnecessary tag area string copying
+
+ When applying tags to a selection, avoid using
+ gtk_editable_get_chars(),
+ which copies the entry content, and instead use gtk_entry_get_text(),
+ which returns a const pointer to the entry string.
+
+M src/tag_area.c
+
+commit 1781770285c0f65bcb6d0e7dc805b12831d0c7cd
+Author: David King <amigadave at amigadave.com>
+Date: Sun Feb 22 10:54:36 2015 +0000
+
+ Clarify a string in the scanner dialog legend
+
+ As reported by Tristan Scott.
+
+M data/scan_dialog.ui
+
+commit 40abf34fa235dcb5527f326bdf772b87b9773bc8
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 23:12:05 2015 +0000
+
+ Use et_str_empty() in several more places
+
+ There are many instances of strlen() being used to check for an empty
+ string, which can be replaced with et_str_empty().
+
+M src/browser.c
+M src/cddb_dialog.c
+M src/playlist_dialog.c
+M src/scan_dialog.c
+M src/tag_area.c
+
+commit 87d56bb8e4013ab1afde622f74317b56d92033c5
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 22:48:32 2015 +0000
+
+ Add simple test for et_str_empty()
+
+M tests/test-misc.c
+
+commit afa3ed43e88762179339bdfad137c21d123deb8f
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 22:39:56 2015 +0000
+
+ Convert most g_utf8_strlen() to new et_str_empty()
+
+ Nearly all uses of g_utf8_strlen() were to check that a string was not
+ empty. The check for empty was often paired with a check that the char
+ pointer was not NULL. Simplify the combination of checks into a new
+ et_str_empty() function, which returns TRUE if either the supplied
+ char
+ pointer is NULL or the string is empty.
+
+ Leave checks that are only concerned with one of the two checks
+ as they
+ are, but remove g_utf8_strlen() where possible.
+
+M src/browser.c
+M src/cddb_dialog.c
+M src/file.c
+M src/load_files_dialog.c
+M src/misc.c
+M src/misc.h
+M src/playlist_dialog.c
+M src/scan_dialog.c
+M src/setting.c
+M src/tag_area.c
+M src/tags/ape_tag.c
+M src/tags/flac_tag.c
+M src/tags/id3_tag.c
+M src/tags/ogg_tag.c
+
+commit 60657a082be24cb131c41d0284d67a4f475b636b
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 20:45:04 2015 +0000
+
+ Remove unused static variables
+
+M src/browser.c
+M src/misc.c
+M src/scan_dialog.c
+
+commit eaeb1453d75e122ccb6c228db46afbda8950d3b2
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 20:21:35 2015 +0000
+
+ Move string length define from header to source
+
+M src/cddb_dialog.c
+M src/easytag.h
+
+commit af0a7687a2226f011fa5000c47f88986316c91f0
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 18:05:32 2015 +0000
+
+ Add a simple test for et_normalized_strcmp0()
+
+M tests/test-misc.c
+
+commit 834b354f5ddf438ee58fa5824ea7b7849eb05e1e
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 17:54:42 2015 +0000
+
+ Add a function for comparing UTF-8 strings
+
+ Comparing strings for equality with g_utf8_collate() gives a poor
+ result, as it is intended for ordering, not equality comparisons. It
+ is
+ preferable to normalize the string first, and then to compare the
+ normalized result.
+
+ Add a new et_normalized_strcmp0() function to do this, and use it in
+ et_file_tag_detect_difference() to avoid problems where two strings
+ compared identically with g_utf8_collate(), which prevented the user
+ from changing tag fields. Adapt the File_Tag test as appropriate.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=744897
+
+M src/file_tag.c
+M src/misc.c
+M src/misc.h
+M tests/test-file_tag.c
+
+commit 8e51def2639137056a0f3ebe845986a2934143da
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 16:49:08 2015 +0000
+
+ Add File_Tag tests
+
+M Makefile.am
+A tests/test-file_tag.c
+
+commit d5ec560efd040fcb065907678a819ec513e51920
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 16:25:13 2015 +0000
+
+ Add a simple undo key test
+
+M tests/test-misc.c
+
+commit af47e0762d646d72b77c77d5f1de234bbaa22095
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 16:20:20 2015 +0000
+
+ Move undo key generation to misc.c
+
+ This should make it easier to write tests.
+
+M src/file.c
+M src/file.h
+M src/file_list.c
+M src/file_name.c
+M src/file_tag.c
+M src/misc.c
+M src/misc.h
+
+commit 6671ad6aa83456325dceaef32e276748f205abad
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 16:05:35 2015 +0000
+
+ Use g_build_filename() in a couple more places
+
+M src/browser.c
+M src/scan_dialog.c
+
+commit 2c202d8e884da7d0749cf907f22c15de204f64b5
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 11:16:31 2015 +0000
+
+ Simplify application window file list navigation
+
+ Factor out the common code to a separate function.
+
+M src/application_window.c
+
+commit 480514bf6375efdaf310c8f299241346b8aa2c1e
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 11:07:06 2015 +0000
+
+ Update AX_COMPILER_FLAGS from autoconf-archive
+
+M m4/ax_compiler_flags.m4
+M m4/ax_compiler_flags_cflags.m4
+
+commit dc2d03daa4924aaa02ab7065ebc46b4fec9ae716
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 11:05:54 2015 +0000
+
+ Tighten invariants when navigating the file list
+
+M src/application_window.c
+
+commit 8702b04364ff590c3181ffbbeeb11b5a49e2cb16
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 21 10:52:31 2015 +0000
+
+ Use ET_Set_Filename_File_Name_Item()
+
+ Rather than setting File_Name fields directly, use the existing helper
+ function.
+
+M src/file_list.c
+
+commit b0c6e89c56e5877fd8398d3a4511bec9767ca4d5
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 19 23:27:23 2015 +0000
+
+ Move filename updating code to application window
+
+ Remove GTK+ calls from the ET_File code.
+
+M src/application_window.c
+M src/file.c
+M src/file.h
+M src/file_name.c
+M src/file_name.h
+
+commit 1a8b1b757f719b16a5a3a62fc9309b743e1b408b
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 19 22:30:25 2015 +0000
+
+ Factor out common file renaming code
+
+ Refactor ET_Save_File_Name_Internal() and ET_Save_File_Name_From_UI()
+ to
+ use a new et_file_name_set_from_components(), and reduce code
+ duplicatoin slightly.
+
+M src/file.c
+
+commit 95dc22cef21b1ed78ccdba4021e4f472bab384b5
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 19 20:32:05 2015 +0000
+
+ Move ET_Display_File_Data_To_UI() to main window
+
+ Rename ET_Display_File_Data_To_UI() to
+ et_application_window_display_et_file() and move it to
+ EtApplicationWindow.
+
+M src/application_window.c
+M src/application_window.h
+M src/browser.c
+M src/cddb_dialog.c
+M src/easytag.c
+M src/file.c
+M src/file.h
+M src/load_files_dialog.c
+M src/scan_dialog.c
+M src/tag_area.c
+
+commit 5daf401c2586ef974139b9e1f96044a585d3d078
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 19 18:34:56 2015 +0000
+
+ Add et_application_window_update_et_file_from_ui()
+
+ Refactor existing code, which directly called
+ ET_Save_File_Data_From_UI() against ETCore->ETFileDisplayed,
+ to instead
+ call the new function. Additionally, handle the case that
+ ETCore->ETFileDisplayed is NULL, and do not call the function,
+ avoiding
+ triggering an invariant check.
+
+M src/application_window.c
+M src/application_window.h
+M src/browser.c
+M src/cddb_dialog.c
+M src/easytag.c
+M src/load_files_dialog.c
+M src/scan_dialog.c
+M src/tag_area.c
+
+commit 9704e1117c36fe893088a71669b9e7f570cf4c27
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 19 17:46:46 2015 +0000
+
+ Remove dead assignment in CDDB dialog
+
+ Found with the Cland statix analyzer.
+
+M src/cddb_dialog.c
+
+commit 01563bb62de675d49d6810f659939057de9b627b
+Author: David King <amigadave at amigadave.com>
+Date: Wed Feb 18 22:54:09 2015 +0000
+
+ Add ifdefs around private FLAC code
+
+ Fix compilation when FLAC support is not enabled.
+
+ https://mail.gnome.org/archives/easytag-list/2015-February/msg00004.html
+
+M src/tags/flac_private.c
+
+commit 92ed3c29cc4bde93ba9f2250e3ecaccad23bcf38
+Author: Marek Černocký <marek at manet.cz>
+Date: Mon Feb 16 22:39:14 2015 +0100
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit 83b4a66ad564f0eba58edcb0c2a742b556781d7f
+Author: David King <amigadave at amigadave.com>
+Date: Mon Feb 16 19:18:50 2015 +0000
+
+ Update AX_COMPILER_FLAGS with --disable-Werror
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=744616
+
+M m4/ax_compiler_flags.m4
+M m4/ax_compiler_flags_cflags.m4
+M m4/ax_compiler_flags_cxxflags.m4
+M m4/ax_compiler_flags_gir.m4
+
+commit 14070f7df03e543b591c5dbc7b28683a6a916299
+Author: Kjartan Maraas <kmaraas at gnome.org>
+Date: Mon Feb 16 20:12:09 2015 +0100
+
+ Updated Norwegian bokmål translation from Åka Sikrom.
+
+M po/nb.po
+
+commit dc11af6b42f456fae92844f3a1cdccc57597eab3
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: Sun Feb 15 18:35:38 2015 +0100
+
+ Updated Polish translation
+
+M po/pl.po
+
+commit 6c50d0e0242a32b0b8fdca588cd15d98c7ce2e07
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 14 20:12:37 2015 +0000
+
+ Set the GError in et_id3tag_check_if_file_is_valid
+
+ If the file was empty, but there were otherwise no errors when reading
+ the file, the GError was left unset. This caused a crash, when reading
+ the error message for display to the user and dereferencing a NULL
+ pointer.
+
+M src/tags/id3_tag.c
+
+commit ca7a1e6f8725df854c4dff41e066bda16d23b7de
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 14 20:07:39 2015 +0000
+
+ Mark a UI string as translatable
+
+M src/file_list.c
+
+commit 13844449f413a66410d230e4494011b15513a484
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 14 20:02:28 2015 +0000
+
+ Check for a valid MP3 file when reading the header
+
+ The check to avoid an infinite loop in id3lib with an empty file was
+ only run when reading ID3 tags, not when reading the header
+ information.
+
+M src/tags/id3_tag.c
+M src/tags/id3_tag.h
+M src/tags/mpeg_header.c
+
+commit 34e64fd011a7ea4126223a36c5ba97e2f984bec5
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 14 19:55:03 2015 +0000
+
+ Refactor et_id3tag_check_if_file_is_corrupted()
+
+ Fit the usual convention of setting the GError when returning
+ FALSE, by
+ renaming the function to et_id3tag_check_if_file_is_valid().
+
+M src/tags/id3_tag.c
+
+commit 5cb07a6b41a3ac86625040824c9ca475f06f4dd4
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 14 00:00:01 2015 +0000
+
+ Remove an unnecessary include
+
+M src/et_core.c
+
+commit d81075d63435a0402bb9dbfac5c3c1801a13df49
+Author: David King <amigadave at amigadave.com>
+Date: Fri Feb 13 23:27:27 2015 +0000
+
+ Remove an unused variable in ET_Core
+
+M src/et_core.h
+M src/file_list.c
+
+commit fc4526c271bc0a3634b235850f10f17f520a6651
+Author: David King <amigadave at amigadave.com>
+Date: Fri Feb 13 23:01:41 2015 +0000
+
+ Add a trivial ET_File_Info test
+
+M Makefile.am
+A tests/test-file_info.c
+
+commit e859c35a810d0688fdba434952611f8671974eda
+Author: David King <amigadave at amigadave.com>
+Date: Fri Feb 13 22:13:27 2015 +0000
+
+ Avoid a crash when reading FLAC files with no tags
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=744497
+
+M src/tags/flac_tag.c
+
+commit b92a6305602ea1d363560473b072a97c6ad363b1
+Author: David King <amigadave at amigadave.com>
+Date: Fri Feb 13 19:58:22 2015 +0000
+
+ Add a test for et_filename_prepare()
+
+M tests/test-misc.c
+
+commit 97385362051bebd8960137310ac8999648f49b70
+Author: David King <amigadave at amigadave.com>
+Date: Fri Feb 13 18:41:05 2015 +0000
+
+ Refactor ET_File_Name_Convert_Character()
+
+ Move ET_File_Name_Convert_Character() to misc.c and rename it
+ et_filename_prepare(). Take a boolean argument for whether to replace
+ illegal characters, rather than using a setting.
+
+M src/cddb_dialog.c
+M src/file.c
+M src/file.h
+M src/load_files_dialog.c
+M src/misc.c
+M src/misc.h
+M src/scan_dialog.c
+
+commit d9ce201e78e42993c7bac186fbd109fd801c2ee7
+Author: David King <amigadave at amigadave.com>
+Date: Fri Feb 13 18:24:37 2015 +0000
+
+ Move File_Name to a separate file
+
+M Makefile.am
+M src/cddb_dialog.c
+M src/file.c
+M src/file.h
+M src/file_list.c
+A src/file_name.c
+A src/file_name.h
+M src/load_files_dialog.c
+M src/scan_dialog.c
+M src/tags/flac_tag.c
+M src/tags/id3_tag.c
+
+commit e8d9f1ba1526c12ff474b55616f363e36d2d34b3
+Author: David King <amigadave at amigadave.com>
+Date: Fri Feb 13 17:22:22 2015 +0000
+
+ Split ET_File_Info off to a separate file
+
+M Makefile.am
+M src/core_types.h
+M src/file.c
+M src/file.h
+A src/file_info.c
+A src/file_info.h
+M src/file_list.c
+
+commit bedea331602546237690d98c01f86e3a7d36f133
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 12 22:56:38 2015 +0000
+
+ Remove unused Makefile variable
+
+M Makefile.am
+
+commit c5b4c2a3ed78851153da64247e223bbefadf6c9a
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 12 22:53:37 2015 +0000
+
+ Pass AX_COMPILER_FLAGS warning flags to the linker
+
+M Makefile.am
+
+commit 9803a41db5d4ee530286f6af15cad7f572afdae6
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 12 22:50:18 2015 +0000
+
+ Enable compiler warnings for Nautilus extension
+
+M Makefile.am
+M nautilus-extension/nautilus-easytag.c
+
+commit 8d75031bdfc79a20f77417e92c9e688c101496bf
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 12 22:44:43 2015 +0000
+
+ Remove unused variable from configure summary
+
+M configure.ac
+
+commit 616154f3a53c29b3c63a40921bf8ee8ef9a623ba
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 12 22:44:28 2015 +0000
+
+ Update SOURCES for 2.3.4 release
+
+M SOURCES
+
+commit 8f4cd655595f7067f44ba6541cce527bb1cec6ea
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 12 17:30:58 2015 +0000
+
+ Correctly update the artwork description
+
+ An EtPicture was fetched from the model containing all the images
+ for a
+ file, and the description was updated depending on what the user
+ entered
+ into the artwork properties dialog.
+
+ However, the updated EtPicture (which was a copy of the one in the
+ model, as EtPicture is a boxed type and was fetched from the
+ model with
+ gtk_tree_model_get()) was not set on the model, and so any change
+ to the
+ description was lost on exiting the dialog.
+
+ Include the EtPicture as part of the gtk_list_store_set() call when
+ closing the dialog, and update the description correctly.
+
+M src/tag_area.c
+
+commit 7c2d6467b66c9863100b12ae5f5e919e66c6a5e2
+Author: David King <amigadave at amigadave.com>
+Date: Thu Feb 12 17:30:36 2015 +0000
+
+ Fix memory leak in artwork types dialog
+
+M src/tag_area.c
+
+commit dd7ee206c5755e9c8d80193510b690350cc964c6
+Author: David King <amigadave at amigadave.com>
+Date: Wed Feb 11 17:49:16 2015 +0000
+
+ Handle empty descriptions in ID3 tag artwork
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=744295
+
+M src/tags/id3v24_tag.c
+
+commit e3f197aae814354925b3528260efbdb4115e657e
+Author: ChrisiPK <ChrisiPK at gmail.com>
+Date: Wed Feb 11 11:46:59 2015 +0000
+
+ Fix CDDB requests being truncated
+
+ EasyTAG does not handle the chunked encoding and truncates lines that
+ fall on chunk boundaries. Make HTTP requests with 1.0 as the protocol
+ version, to avoid a chunked transfer encoding.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=743812
+
+M src/cddb_dialog.c
+
+commit 6879d49ad2969fe25db928dba3c9164ffdd8294e
+Author: Osman Karagöz <osmank3 at gmail.com>
+Date: Wed Feb 11 10:33:06 2015 +0000
+
+ Updated Turkish translation
+
+M po/tr.po
+
+commit 70e049b83bd5185883b55707a981b3b64f36c11a
+Author: Marek Černocký <marek at manet.cz>
+Date: Sun Feb 8 23:21:02 2015 +0100
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit 1a775b1c0605e360ac6f1363c38fc774a0cb6d88
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: Sun Feb 8 13:56:52 2015 +0100
+
+ Updated Polish translation
+
+M po/pl.po
+
+commit 69f6bb575c0368bbe658d03b43533cbf7577ee6e
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 7 21:27:46 2015 +0000
+
+ Fix format warnings caused by incorrect sign
+
+ GCC 5.0 now warns about using %d as a format specifier for an unsigned
+ int.
+
+M src/application.c
+M src/cddb_dialog.c
+M src/easytag.c
+M src/file.c
+M src/file_area.c
+M src/file_list.c
+M src/misc.c
+M src/tag_area.c
+M src/tags/libapetag/apetaglib.c
+
+commit 5df5c6193c51cdc77feefde05a26161a9d715c7e
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 7 09:55:52 2015 +0000
+
+ Add missing break in playlist dialog switch
+
+ Found with Coverity (CID 1268296).
+
+M src/playlist_dialog.c
+
+commit 5b8659a80ece30fb7353ac68c3381d8f7d5123d0
+Author: David King <amigadave at amigadave.com>
+Date: Sat Feb 7 09:52:59 2015 +0000
+
+ Return a value from et_artist_album_list_add_file
+
+ Use g_return_val_if_fail() rather than g_return_if_fail(), and
+ return an
+ empty list of no ET_File is supplied.
+
+ Found with Coverity (CID 1268295).
+
+M src/file_list.c
+
+commit 54ba8cf11c92650ab20d33670df66144c6ee2e67
+Author: David King <amigadave at amigadave.com>
+Date: Fri Feb 6 20:43:33 2015 +0000
+
+ Add checks for extra id3lib declarations
+
+ Fix compilation of id3lib wrapper on Debian, which includes some C
+ wrapper functions which were not in the id3lib 3.8.3 release, by
+ checking for the declarations with AC_CHECK_DECLS.
+
+M configure.ac
+M src/tags/id3lib/id3_bugfix.h
+
commit bec4bdd64f7650e0051f90d198ab3e6ee9a4dfb3
Author: David King <amigadave at amigadave.com>
-Date: Fri Feb 6 17:49:05 2015 +0000
+Date: Fri Feb 6 17:49:05 2015 +0000
Update NEWS for 2.3.4 release
diff --git a/Makefile.am b/Makefile.am
index 4857525..73ef15f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,9 @@ easytag_CPPFLAGS = \
-I$(top_srcdir)/src/tags \
-I$(top_builddir) \
-I$(top_builddir)/src \
- $(DEPRECATED_CPPFLAGS) \
- -DLOCALEDIR=\"$(localedir)\"
+ -DLOCALEDIR=\"$(localedir)\" \
+ $(GLIB_DEPRECATION_FLAGS) \
+ $(GTK_DEPRECATION_FLAGS)
easytag_CFLAGS = \
$(WARN_CFLAGS) \
@@ -52,7 +53,9 @@ easytag_SOURCES = \
src/file.c \
src/file_area.c \
src/file_description.c \
+ src/file_info.c \
src/file_list.c \
+ src/file_name.c \
src/file_tag.c \
src/load_files_dialog.c \
src/log.c \
@@ -111,7 +114,9 @@ easytag_headers = \
src/file.h \
src/file_area.h \
src/file_description.h \
+ src/file_info.h \
src/file_list.h \
+ src/file_name.h \
src/file_tag.h \
src/genres.h \
src/load_files_dialog.h \
@@ -161,6 +166,9 @@ easytag_LDADD = \
$(ID3LIB_LIBS) \
$(easytag_rc)
+easytag_LDFLAGS = \
+ $(WARN_LDFLAGS)
+
noinst_resource_files = \
$(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir)/data $(srcdir)/data/org.gnome.EasyTAG.gresource.xml)
@@ -177,7 +185,7 @@ easytag_rc.$(OBJEXT): src/win32/easytag.rc src/win32/easytag.manifest data/icons
easytag_rc = easytag_rc.$(OBJEXT)
-easytag_LDFLAGS = \
+easytag_LDFLAGS += \
-Wl,--subsystem,windows
easytag-$(PACKAGE_VERSION)-setup.exe: easytag-win32-installer.nsi easytag.exe Makefile
@@ -247,12 +255,17 @@ libnautilus_easytag_la_SOURCES = \
libnautilus_easytag_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
- $(DEPRECATED_CPPFLAGS) \
-DLOCALEDIR=\"$(localedir)\" \
- $(NAUTILUS_CFLAGS)
+ $(NAUTILUS_CFLAGS) \
+ $(GLIB_DEPRECATION_FLAGS) \
+ $(GTK_DEPRECATION_FLAGS)
+
+libnautilus_easytag_la_CFLAGS = \
+ $(WARN_CFLAGS)
libnautilus_easytag_la_LDFLAGS = \
- -module -avoid-version -no-undefined
+ -module -avoid-version -no-undefined \
+ $(WARN_LDFLAGS)
libnautilus_easytag_la_LIBADD = \
$(NAUTILUS_LIBS)
@@ -426,18 +439,27 @@ test-report perf-report full-report: $(check_PROGRAMS)
check_PROGRAMS = \
tests/test-dlm \
tests/test-file_description \
+ tests/test-file_info \
+ tests/test-file_tag \
tests/test-misc \
tests/test-picture \
tests/test-scan
-tests_test_dlm_CPPFLAGS = \
+common_test_cppflags = \
-I$(top_srcdir)/src \
-I$(top_builddir) \
- $(DEPRECATED_CPPFLAGS)
+ $(GLIB_DEPRECATION_FLAGS) \
+ $(GTK_DEPRECATION_FLAGS)
+
+common_test_cflags = \
+ $(EASYTAG_CFLAGS) \
+ $(WARN_CFLAGS)
+
+tests_test_dlm_CPPFLAGS = \
+ $(common_test_cppflags)
tests_test_dlm_CFLAGS = \
- $(WARN_CFLAGS) \
- $(EASYTAG_CFLAGS)
+ $(common_test_cflags)
tests_test_dlm_SOURCES = \
tests/test-dlm.c \
@@ -447,13 +469,10 @@ tests_test_dlm_LDADD = \
$(EASYTAG_LIBS)
tests_test_file_description_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_builddir) \
- $(DEPRECATED_CPPFLAGS)
+ $(common_test_cppflags)
tests_test_file_description_CFLAGS = \
- $(WARN_CFLAGS) \
- $(EASYTAG_CFLAGS)
+ $(common_test_cflags)
tests_test_file_description_SOURCES = \
tests/test-file_description.c \
@@ -462,15 +481,41 @@ tests_test_file_description_SOURCES = \
tests_test_file_description_LDADD = \
$(EASYTAG_LIBS)
+tests_test_file_info_CPPFLAGS = \
+ $(common_test_cppflags)
+
+tests_test_file_info_CFLAGS = \
+ $(common_test_cflags)
+
+tests_test_file_info_SOURCES = \
+ tests/test-file_info.c \
+ src/file_info.c
+
+tests_test_file_info_LDADD = \
+ $(EASYTAG_LIBS)
+
+tests_test_file_tag_CPPFLAGS = \
+ $(common_test_cppflags) \
+ -I$(top_srcdir)/src/tags
+
+tests_test_file_tag_CFLAGS = \
+ $(common_test_cflags)
+
+tests_test_file_tag_SOURCES = \
+ tests/test-file_tag.c \
+ src/file_tag.c \
+ src/misc.c \
+ src/picture.c
+
+tests_test_file_tag_LDADD = \
+ $(EASYTAG_LIBS)
+
tests_test_misc_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/tags \
- -I$(top_builddir) \
- $(DEPRECATED_CPPFLAGS)
+ $(common_test_cppflags) \
+ -I$(top_srcdir)/src/tags
tests_test_misc_CFLAGS = \
- $(WARN_CFLAGS) \
- $(EASYTAG_CFLAGS)
+ $(common_test_cflags)
tests_test_misc_SOURCES = \
tests/test-misc.c \
@@ -480,13 +525,10 @@ tests_test_misc_LDADD = \
$(EASYTAG_LIBS)
tests_test_picture_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_builddir) \
- $(DEPRECATED_CPPFLAGS)
+ $(common_test_cppflags)
tests_test_picture_CFLAGS = \
- $(WARN_CFLAGS) \
- $(EASYTAG_CFLAGS)
+ $(common_test_cflags)
tests_test_picture_SOURCES = \
tests/test-picture.c \
@@ -496,13 +538,10 @@ tests_test_picture_LDADD = \
$(EASYTAG_LIBS)
tests_test_scan_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_builddir) \
- $(DEPRECATED_CPPFLAGS)
+ $(common_test_cppflags)
tests_test_scan_CFLAGS = \
- $(WARN_CFLAGS) \
- $(EASYTAG_CFLAGS)
+ $(common_test_cflags)
tests_test_scan_SOURCES = \
tests/test-scan.c \
diff --git a/Makefile.in b/Makefile.in
index 62601fc..125dbf8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,8 +92,13 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = easytag$(EXEEXT)
+ at WINDOWS_HOST_TRUE@am__append_1 = \
+ at WINDOWS_HOST_TRUE@ -Wl,--subsystem,windows
+
@EASYTAG_ENABLE_TESTS_TRUE at check_PROGRAMS = tests/test-dlm$(EXEEXT) \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-file_description$(EXEEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ tests/test-file_info$(EXEEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ tests/test-file_tag$(EXEEXT) \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-misc$(EXEEXT) \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-picture$(EXEEXT) \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-scan$(EXEEXT)
@@ -181,8 +186,8 @@ am__v_lt_0 = --silent
am__v_lt_1 =
libnautilus_easytag_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(libnautilus_easytag_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ $(libnautilus_easytag_la_CFLAGS) $(CFLAGS) \
+ $(libnautilus_easytag_la_LDFLAGS) $(LDFLAGS) -o $@
@ENABLE_NAUTILUS_ACTIONS_TRUE at am_libnautilus_easytag_la_rpath = \
@ENABLE_NAUTILUS_ACTIONS_TRUE@ -rpath $(nautilus_extensiondir)
PROGRAMS = $(bin_PROGRAMS)
@@ -196,7 +201,9 @@ am_easytag_OBJECTS = src/easytag-about.$(OBJEXT) \
src/easytag-enums.$(OBJEXT) src/easytag-et_core.$(OBJEXT) \
src/easytag-file.$(OBJEXT) src/easytag-file_area.$(OBJEXT) \
src/easytag-file_description.$(OBJEXT) \
- src/easytag-file_list.$(OBJEXT) src/easytag-file_tag.$(OBJEXT) \
+ src/easytag-file_info.$(OBJEXT) \
+ src/easytag-file_list.$(OBJEXT) \
+ src/easytag-file_name.$(OBJEXT) src/easytag-file_tag.$(OBJEXT) \
src/easytag-load_files_dialog.$(OBJEXT) \
src/easytag-log.$(OBJEXT) src/easytag-main.$(OBJEXT) \
src/easytag-misc.$(OBJEXT) src/easytag-picture.$(OBJEXT) \
@@ -261,6 +268,30 @@ tests_test_file_description_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(tests_test_file_description_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
+am__tests_test_file_info_SOURCES_DIST = tests/test-file_info.c \
+ src/file_info.c
+ at EASYTAG_ENABLE_TESTS_TRUE@am_tests_test_file_info_OBJECTS = tests/tests_test_file_info-test-file_info.$(OBJEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ src/tests_test_file_info-file_info.$(OBJEXT)
+tests_test_file_info_OBJECTS = $(am_tests_test_file_info_OBJECTS)
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_info_DEPENDENCIES = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(am__DEPENDENCIES_1)
+tests_test_file_info_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(tests_test_file_info_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+am__tests_test_file_tag_SOURCES_DIST = tests/test-file_tag.c \
+ src/file_tag.c src/misc.c src/picture.c
+ at EASYTAG_ENABLE_TESTS_TRUE@am_tests_test_file_tag_OBJECTS = tests/tests_test_file_tag-test-file_tag.$(OBJEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ src/tests_test_file_tag-file_tag.$(OBJEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ src/tests_test_file_tag-misc.$(OBJEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ src/tests_test_file_tag-picture.$(OBJEXT)
+tests_test_file_tag_OBJECTS = $(am_tests_test_file_tag_OBJECTS)
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_tag_DEPENDENCIES = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(am__DEPENDENCIES_1)
+tests_test_file_tag_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(tests_test_file_tag_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
am__tests_test_misc_SOURCES_DIST = tests/test-misc.c src/misc.c
@EASYTAG_ENABLE_TESTS_TRUE at am_tests_test_misc_OBJECTS = tests/tests_test_misc-test-misc.$(OBJEXT) \
@EASYTAG_ENABLE_TESTS_TRUE@ src/tests_test_misc-misc.$(OBJEXT)
@@ -348,11 +379,14 @@ am__v_CXXLD_1 =
SOURCES = $(libnautilus_easytag_la_SOURCES) $(easytag_SOURCES) \
$(nodist_easytag_SOURCES) $(tests_test_dlm_SOURCES) \
$(tests_test_file_description_SOURCES) \
+ $(tests_test_file_info_SOURCES) $(tests_test_file_tag_SOURCES) \
$(tests_test_misc_SOURCES) $(tests_test_picture_SOURCES) \
$(tests_test_scan_SOURCES)
DIST_SOURCES = $(am__libnautilus_easytag_la_SOURCES_DIST) \
$(easytag_SOURCES) $(am__tests_test_dlm_SOURCES_DIST) \
$(am__tests_test_file_description_SOURCES_DIST) \
+ $(am__tests_test_file_info_SOURCES_DIST) \
+ $(am__tests_test_file_tag_SOURCES_DIST) \
$(am__tests_test_misc_SOURCES_DIST) \
$(am__tests_test_picture_SOURCES_DIST) \
$(am__tests_test_scan_SOURCES_DIST)
@@ -679,12 +713,14 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIT = @GIT@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
+GLIB_DEPRECATION_FLAGS = @GLIB_DEPRECATION_FLAGS@
GLIB_MKENUMS = @GLIB_MKENUMS@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTESTER = @GTESTER@
GTESTER_REPORT = @GTESTER_REPORT@
+GTK_DEPRECATION_FLAGS = @GTK_DEPRECATION_FLAGS@
HELP_DIR = @HELP_DIR@
ID3LIB_LIBS = @ID3LIB_LIBS@
INSTALL = @INSTALL@
@@ -709,6 +745,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -833,8 +870,9 @@ easytag_CPPFLAGS = \
-I$(top_srcdir)/src/tags \
-I$(top_builddir) \
-I$(top_builddir)/src \
- $(DEPRECATED_CPPFLAGS) \
- -DLOCALEDIR=\"$(localedir)\"
+ -DLOCALEDIR=\"$(localedir)\" \
+ $(GLIB_DEPRECATION_FLAGS) \
+ $(GTK_DEPRECATION_FLAGS)
easytag_CFLAGS = \
$(WARN_CFLAGS) \
@@ -860,7 +898,9 @@ easytag_SOURCES = \
src/file.c \
src/file_area.c \
src/file_description.c \
+ src/file_info.c \
src/file_list.c \
+ src/file_name.c \
src/file_tag.c \
src/load_files_dialog.c \
src/log.c \
@@ -919,7 +959,9 @@ easytag_headers = \
src/file.h \
src/file_area.h \
src/file_description.h \
+ src/file_info.h \
src/file_list.h \
+ src/file_name.h \
src/file_tag.h \
src/genres.h \
src/load_files_dialog.h \
@@ -969,15 +1011,13 @@ easytag_LDADD = \
$(ID3LIB_LIBS) \
$(easytag_rc)
+easytag_LDFLAGS = $(WARN_LDFLAGS) $(am__append_1)
noinst_resource_files = \
$(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir)/data $(srcdir)/data/org.gnome.EasyTAG.gresource.xml)
@WINDOWS_HOST_TRUE at ICONDIR = $(srcdir)/data/icons/win32
@WINDOWS_HOST_TRUE at MANIFESTDIR = $(srcdir)/src/win32
@WINDOWS_HOST_TRUE at easytag_rc = easytag_rc.$(OBJEXT)
- at WINDOWS_HOST_TRUE@easytag_LDFLAGS = \
- at WINDOWS_HOST_TRUE@ -Wl,--subsystem,windows
-
BUILT_SOURCES = \
$(nodist_easytag_SOURCES) \
src/enums.h
@@ -999,12 +1039,17 @@ easytag_enum_headers = \
@ENABLE_NAUTILUS_ACTIONS_TRUE at libnautilus_easytag_la_CPPFLAGS = \
@ENABLE_NAUTILUS_ACTIONS_TRUE@ -I$(top_srcdir) \
@ENABLE_NAUTILUS_ACTIONS_TRUE@ -I$(top_builddir) \
- at ENABLE_NAUTILUS_ACTIONS_TRUE@ $(DEPRECATED_CPPFLAGS) \
@ENABLE_NAUTILUS_ACTIONS_TRUE@ -DLOCALEDIR=\"$(localedir)\" \
- at ENABLE_NAUTILUS_ACTIONS_TRUE@ $(NAUTILUS_CFLAGS)
+ at ENABLE_NAUTILUS_ACTIONS_TRUE@ $(NAUTILUS_CFLAGS) \
+ at ENABLE_NAUTILUS_ACTIONS_TRUE@ $(GLIB_DEPRECATION_FLAGS) \
+ at ENABLE_NAUTILUS_ACTIONS_TRUE@ $(GTK_DEPRECATION_FLAGS)
+
+ at ENABLE_NAUTILUS_ACTIONS_TRUE@libnautilus_easytag_la_CFLAGS = \
+ at ENABLE_NAUTILUS_ACTIONS_TRUE@ $(WARN_CFLAGS)
@ENABLE_NAUTILUS_ACTIONS_TRUE at libnautilus_easytag_la_LDFLAGS = \
- at ENABLE_NAUTILUS_ACTIONS_TRUE@ -module -avoid-version -no-undefined
+ at ENABLE_NAUTILUS_ACTIONS_TRUE@ -module -avoid-version -no-undefined \
+ at ENABLE_NAUTILUS_ACTIONS_TRUE@ $(WARN_LDFLAGS)
@ENABLE_NAUTILUS_ACTIONS_TRUE at libnautilus_easytag_la_LIBADD = \
@ENABLE_NAUTILUS_ACTIONS_TRUE@ $(NAUTILUS_LIBS)
@@ -1105,14 +1150,21 @@ dist_noinst_SCRIPTS = \
@EASYTAG_ENABLE_TESTS_TRUE@ MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) \
@EASYTAG_ENABLE_TESTS_TRUE@ G_SLICE=debug-blocks
- at EASYTAG_ENABLE_TESTS_TRUE@tests_test_dlm_CPPFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@common_test_cppflags = \
@EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src \
@EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_builddir) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(DEPRECATED_CPPFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(GLIB_DEPRECATION_FLAGS) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(GTK_DEPRECATION_FLAGS)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@common_test_cflags = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_CFLAGS) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(WARN_CFLAGS)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_dlm_CPPFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cppflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_dlm_CFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(WARN_CFLAGS) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_CFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_dlm_SOURCES = \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-dlm.c \
@@ -1122,13 +1174,10 @@ dist_noinst_SCRIPTS = \
@EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_LIBS)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_file_description_CPPFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_builddir) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(DEPRECATED_CPPFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cppflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_file_description_CFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(WARN_CFLAGS) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_CFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_file_description_SOURCES = \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-file_description.c \
@@ -1137,15 +1186,41 @@ dist_noinst_SCRIPTS = \
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_file_description_LDADD = \
@EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_LIBS)
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_info_CPPFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cppflags)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_info_CFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cflags)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_info_SOURCES = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ tests/test-file_info.c \
+ at EASYTAG_ENABLE_TESTS_TRUE@ src/file_info.c
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_info_LDADD = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_LIBS)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_tag_CPPFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cppflags) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src/tags
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_tag_CFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cflags)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_tag_SOURCES = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ tests/test-file_tag.c \
+ at EASYTAG_ENABLE_TESTS_TRUE@ src/file_tag.c \
+ at EASYTAG_ENABLE_TESTS_TRUE@ src/misc.c \
+ at EASYTAG_ENABLE_TESTS_TRUE@ src/picture.c
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_tag_LDADD = \
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_LIBS)
+
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_misc_CPPFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src/tags \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_builddir) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(DEPRECATED_CPPFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cppflags) \
+ at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src/tags
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_misc_CFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(WARN_CFLAGS) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_CFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_misc_SOURCES = \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-misc.c \
@@ -1155,13 +1230,10 @@ dist_noinst_SCRIPTS = \
@EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_LIBS)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_picture_CPPFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_builddir) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(DEPRECATED_CPPFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cppflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_picture_CFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(WARN_CFLAGS) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_CFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_picture_SOURCES = \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-picture.c \
@@ -1171,13 +1243,10 @@ dist_noinst_SCRIPTS = \
@EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_LIBS)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_scan_CPPFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src \
- at EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_builddir) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(DEPRECATED_CPPFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cppflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_scan_CFLAGS = \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(WARN_CFLAGS) \
- at EASYTAG_ENABLE_TESTS_TRUE@ $(EASYTAG_CFLAGS)
+ at EASYTAG_ENABLE_TESTS_TRUE@ $(common_test_cflags)
@EASYTAG_ENABLE_TESTS_TRUE at tests_test_scan_SOURCES = \
@EASYTAG_ENABLE_TESTS_TRUE@ tests/test-scan.c \
@@ -1405,8 +1474,12 @@ src/easytag-file_area.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/easytag-file_description.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-file_info.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
src/easytag-file_list.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-file_name.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
src/easytag-file_tag.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/easytag-load_files_dialog.$(OBJEXT): src/$(am__dirstamp) \
@@ -1544,6 +1617,26 @@ src/tests_test_file_description-file_description.$(OBJEXT): \
tests/test-file_description$(EXEEXT): $(tests_test_file_description_OBJECTS) $(tests_test_file_description_DEPENDENCIES) $(EXTRA_tests_test_file_description_DEPENDENCIES) tests/$(am__dirstamp)
@rm -f tests/test-file_description$(EXEEXT)
$(AM_V_CCLD)$(tests_test_file_description_LINK) $(tests_test_file_description_OBJECTS) $(tests_test_file_description_LDADD) $(LIBS)
+tests/tests_test_file_info-test-file_info.$(OBJEXT): \
+ tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
+src/tests_test_file_info-file_info.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+
+tests/test-file_info$(EXEEXT): $(tests_test_file_info_OBJECTS) $(tests_test_file_info_DEPENDENCIES) $(EXTRA_tests_test_file_info_DEPENDENCIES) tests/$(am__dirstamp)
+ @rm -f tests/test-file_info$(EXEEXT)
+ $(AM_V_CCLD)$(tests_test_file_info_LINK) $(tests_test_file_info_OBJECTS) $(tests_test_file_info_LDADD) $(LIBS)
+tests/tests_test_file_tag-test-file_tag.$(OBJEXT): \
+ tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
+src/tests_test_file_tag-file_tag.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/tests_test_file_tag-misc.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/tests_test_file_tag-picture.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+
+tests/test-file_tag$(EXEEXT): $(tests_test_file_tag_OBJECTS) $(tests_test_file_tag_DEPENDENCIES) $(EXTRA_tests_test_file_tag_DEPENDENCIES) tests/$(am__dirstamp)
+ @rm -f tests/test-file_tag$(EXEEXT)
+ $(AM_V_CCLD)$(tests_test_file_tag_LINK) $(tests_test_file_tag_OBJECTS) $(tests_test_file_tag_LDADD) $(LIBS)
tests/tests_test_misc-test-misc.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
src/tests_test_misc-misc.$(OBJEXT): src/$(am__dirstamp) \
@@ -1598,7 +1691,9 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_area.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_description.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_info.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_list.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_name.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_tag.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-load_files_dialog.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-log.Po at am__quote@
@@ -1617,6 +1712,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-tag_area.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_dlm-dlm.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_file_description-file_description.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_file_info-file_info.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_file_tag-file_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_file_tag-misc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_file_tag-picture.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_misc-misc.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_picture-picture.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_scan-scan.Po at am__quote@
@@ -1647,6 +1746,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/win32/$(DEPDIR)/easytag-win32dep.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_dlm-test-dlm.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_file_description-test-file_description.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_file_info-test-file_info.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_file_tag-test-file_tag.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_misc-test-misc.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_picture-test-picture.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_scan-test-scan.Po at am__quote@
@@ -1676,11 +1777,11 @@ distclean-compile:
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
nautilus-extension/libnautilus_easytag_la-nautilus-easytag.lo: nautilus-extension/nautilus-easytag.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnautilus_easytag_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nautilus-extension/libnautilus_easytag_la-nautilus-easytag.lo -MD -MP -MF nautilus-extension/$(DEPDIR)/libnautilus_easytag_la-nautilus-easytag.Tpo -c -o nautilus-extension/libnautilus_easytag_la-nautilus-easytag.lo `test -f 'nautilus-extension/nautilus-easytag.c' || echo '$(srcdir)/'`nautilus-extension/nautilus-easytag.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnautilus_easytag_la_CPPFLAGS) $(CPPFLAGS) $(libnautilus_easytag_la_CFLAGS) $(CFLAGS) -MT nautilus-extension/libnautilus_easytag_la-nautilus-easytag.lo -MD -MP -MF nautilus-extension/$(DEPDIR)/libnautilus_easytag_la-nautilus-easytag.Tpo -c -o nautilus-extension/libnautilus_easytag_la-nautilus-easytag.lo `test -f 'nautilus-extension/nautilus-easytag.c' || echo '$(srcdir)/'`nautilus-extension/nautilus-easytag.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) nautilus-extension/$(DEPDIR)/libnautilus_easytag_la-nautilus-easytag.Tpo nautilus-extension/$(DEPDIR)/libnautilus_easytag_la-nautilus-easytag.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='nautilus-extension/nautilus-easytag.c' object='nautilus-extension/libnautilus_easytag_la-nautilus-easytag.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnautilus_easytag_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nautilus-extension/libnautilus_easytag_la-nautilus-easytag.lo `test -f 'nautilus-extension/nautilus-easytag.c' || echo '$(srcdir)/'`nautilus-extension/nautilus-easytag.c
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnautilus_easytag_la_CPPFLAGS) $(CPPFLAGS) $(libnautilus_easytag_la_CFLAGS) $(CFLAGS) -c -o nautilus-extension/libnautilus_easytag_la-nautilus-easytag.lo `test -f 'nautilus-extension/nautilus-easytag.c' || echo '$(srcdir)/'`nautilus-extension/nautilus-easytag.c
src/easytag-about.o: src/about.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-about.o -MD -MP -MF src/$(DEPDIR)/easytag-about.Tpo -c -o src/easytag-about.o `test -f 'src/about.c' || echo '$(srcdir)/'`src/about.c
@@ -1878,6 +1979,20 @@ src/easytag-file_description.obj: src/file_description.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-file_description.obj `if test -f 'src/file_description.c'; then $(CYGPATH_W) 'src/file_description.c'; else $(CYGPATH_W) '$(srcdir)/src/file_description.c'; fi`
+src/easytag-file_info.o: src/file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_info.o -MD -MP -MF src/$(DEPDIR)/easytag-file_info.Tpo -c -o src/easytag-file_info.o `test -f 'src/file_info.c' || echo '$(srcdir)/'`src/file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_info.Tpo src/$(DEPDIR)/easytag-file_info.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file_info.c' object='src/easytag-file_info.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-file_info.o `test -f 'src/file_info.c' || echo '$(srcdir)/'`src/file_info.c
+
+src/easytag-file_info.obj: src/file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_info.obj -MD -MP -MF src/$(DEPDIR)/easytag-file_info.Tpo -c -o src/easytag-file_info.obj `if test -f 'src/file_info.c'; then $(CYGPATH_W) 'src/file_info.c'; else $(CYGPATH_W) '$(srcdir)/src/file_info.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_info.Tpo src/$(DEPDIR)/easytag-file_info.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file_info.c' object='src/easytag-file_info.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-file_info.obj `if test -f 'src/file_info.c'; then $(CYGPATH_W) 'src/file_info.c'; else $(CYGPATH_W) '$(srcdir)/src/file_info.c'; fi`
+
src/easytag-file_list.o: src/file_list.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_list.o -MD -MP -MF src/$(DEPDIR)/easytag-file_list.Tpo -c -o src/easytag-file_list.o `test -f 'src/file_list.c' || echo '$(srcdir)/'`src/file_list.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_list.Tpo src/$(DEPDIR)/easytag-file_list.Po
@@ -1892,6 +2007,20 @@ src/easytag-file_list.obj: src/file_list.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-file_list.obj `if test -f 'src/file_list.c'; then $(CYGPATH_W) 'src/file_list.c'; else $(CYGPATH_W) '$(srcdir)/src/file_list.c'; fi`
+src/easytag-file_name.o: src/file_name.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_name.o -MD -MP -MF src/$(DEPDIR)/easytag-file_name.Tpo -c -o src/easytag-file_name.o `test -f 'src/file_name.c' || echo '$(srcdir)/'`src/file_name.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_name.Tpo src/$(DEPDIR)/easytag-file_name.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file_name.c' object='src/easytag-file_name.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-file_name.o `test -f 'src/file_name.c' || echo '$(srcdir)/'`src/file_name.c
+
+src/easytag-file_name.obj: src/file_name.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_name.obj -MD -MP -MF src/$(DEPDIR)/easytag-file_name.Tpo -c -o src/easytag-file_name.obj `if test -f 'src/file_name.c'; then $(CYGPATH_W) 'src/file_name.c'; else $(CYGPATH_W) '$(srcdir)/src/file_name.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_name.Tpo src/$(DEPDIR)/easytag-file_name.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file_name.c' object='src/easytag-file_name.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-file_name.obj `if test -f 'src/file_name.c'; then $(CYGPATH_W) 'src/file_name.c'; else $(CYGPATH_W) '$(srcdir)/src/file_name.c'; fi`
+
src/easytag-file_tag.o: src/file_tag.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_tag.o -MD -MP -MF src/$(DEPDIR)/easytag-file_tag.Tpo -c -o src/easytag-file_tag.o `test -f 'src/file_tag.c' || echo '$(srcdir)/'`src/file_tag.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_tag.Tpo src/$(DEPDIR)/easytag-file_tag.Po
@@ -2480,6 +2609,90 @@ src/tests_test_file_description-file_description.obj: src/file_description.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_description-file_description.obj `if test -f 'src/file_description.c'; then $(CYGPATH_W) 'src/file_description.c'; else $(CYGPATH_W) '$(srcdir)/src/file_description.c'; fi`
+tests/tests_test_file_info-test-file_info.o: tests/test-file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_info_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_info_CFLAGS) $(CFLAGS) -MT tests/tests_test_file_info-test-file_info.o -MD -MP -MF tests/$(DEPDIR)/tests_test_file_info-test-file_info.Tpo -c -o tests/tests_test_file_info-test-file_info.o `test -f 'tests/test-file_info.c' || echo '$(srcdir)/'`tests/test-file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_file_info-test-file_info.Tpo tests/$(DEPDIR)/tests_test_file_info-test-file_info.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/test-file_info.c' object='tests/tests_test_file_info-test-file_info.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_info_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_info_CFLAGS) $(CFLAGS) -c -o tests/tests_test_file_info-test-file_info.o `test -f 'tests/test-file_info.c' || echo '$(srcdir)/'`tests/test-file_info.c
+
+tests/tests_test_file_info-test-file_info.obj: tests/test-file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_info_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_info_CFLAGS) $(CFLAGS) -MT tests/tests_test_file_info-test-file_info.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_file_info-test-file_info.Tpo -c -o tests/tests_test_file_info-test-file_info.obj `if test -f 'tests/test-file_info.c'; then $(CYGPATH_W) 'tests/test-file_info.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-file_info.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_file_info-test-file_info.Tpo tests/$(DEPDIR)/tests_test_file_info-test-file_info.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/test-file_info.c' object='tests/tests_test_file_info-test-file_info.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_info_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_info_CFLAGS) $(CFLAGS) -c -o tests/tests_test_file_info-test-file_info.obj `if test -f 'tests/test-file_info.c'; then $(CYGPATH_W) 'tests/test-file_info.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-file_info.c'; fi`
+
+src/tests_test_file_info-file_info.o: src/file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_info_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_info_CFLAGS) $(CFLAGS) -MT src/tests_test_file_info-file_info.o -MD -MP -MF src/$(DEPDIR)/tests_test_file_info-file_info.Tpo -c -o src/tests_test_file_info-file_info.o `test -f 'src/file_info.c' || echo '$(srcdir)/'`src/file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_info-file_info.Tpo src/$(DEPDIR)/tests_test_file_info-file_info.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file_info.c' object='src/tests_test_file_info-file_info.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_info_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_info_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_info-file_info.o `test -f 'src/file_info.c' || echo '$(srcdir)/'`src/file_info.c
+
+src/tests_test_file_info-file_info.obj: src/file_info.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_info_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_info_CFLAGS) $(CFLAGS) -MT src/tests_test_file_info-file_info.obj -MD -MP -MF src/$(DEPDIR)/tests_test_file_info-file_info.Tpo -c -o src/tests_test_file_info-file_info.obj `if test -f 'src/file_info.c'; then $(CYGPATH_W) 'src/file_info.c'; else $(CYGPATH_W) '$(srcdir)/src/file_info.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_info-file_info.Tpo src/$(DEPDIR)/tests_test_file_info-file_info.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file_info.c' object='src/tests_test_file_info-file_info.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_info_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_info_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_info-file_info.obj `if test -f 'src/file_info.c'; then $(CYGPATH_W) 'src/file_info.c'; else $(CYGPATH_W) '$(srcdir)/src/file_info.c'; fi`
+
+tests/tests_test_file_tag-test-file_tag.o: tests/test-file_tag.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -MT tests/tests_test_file_tag-test-file_tag.o -MD -MP -MF tests/$(DEPDIR)/tests_test_file_tag-test-file_tag.Tpo -c -o tests/tests_test_file_tag-test-file_tag.o `test -f 'tests/test-file_tag.c' || echo '$(srcdir)/'`tests/test-file_tag.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_file_tag-test-file_tag.Tpo tests/$(DEPDIR)/tests_test_file_tag-test-file_tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/test-file_tag.c' object='tests/tests_test_file_tag-test-file_tag.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -c -o tests/tests_test_file_tag-test-file_tag.o `test -f 'tests/test-file_tag.c' || echo '$(srcdir)/'`tests/test-file_tag.c
+
+tests/tests_test_file_tag-test-file_tag.obj: tests/test-file_tag.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -MT tests/tests_test_file_tag-test-file_tag.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_file_tag-test-file_tag.Tpo -c -o tests/tests_test_file_tag-test-file_tag.obj `if test -f 'tests/test-file_tag.c'; then $(CYGPATH_W) 'tests/test-file_tag.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-file_tag.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_file_tag-test-file_tag.Tpo tests/$(DEPDIR)/tests_test_file_tag-test-file_tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/test-file_tag.c' object='tests/tests_test_file_tag-test-file_tag.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -c -o tests/tests_test_file_tag-test-file_tag.obj `if test -f 'tests/test-file_tag.c'; then $(CYGPATH_W) 'tests/test-file_tag.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-file_tag.c'; fi`
+
+src/tests_test_file_tag-file_tag.o: src/file_tag.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -MT src/tests_test_file_tag-file_tag.o -MD -MP -MF src/$(DEPDIR)/tests_test_file_tag-file_tag.Tpo -c -o src/tests_test_file_tag-file_tag.o `test -f 'src/file_tag.c' || echo '$(srcdir)/'`src/file_tag.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_tag-file_tag.Tpo src/$(DEPDIR)/tests_test_file_tag-file_tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file_tag.c' object='src/tests_test_file_tag-file_tag.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_tag-file_tag.o `test -f 'src/file_tag.c' || echo '$(srcdir)/'`src/file_tag.c
+
+src/tests_test_file_tag-file_tag.obj: src/file_tag.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -MT src/tests_test_file_tag-file_tag.obj -MD -MP -MF src/$(DEPDIR)/tests_test_file_tag-file_tag.Tpo -c -o src/tests_test_file_tag-file_tag.obj `if test -f 'src/file_tag.c'; then $(CYGPATH_W) 'src/file_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/file_tag.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_tag-file_tag.Tpo src/$(DEPDIR)/tests_test_file_tag-file_tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file_tag.c' object='src/tests_test_file_tag-file_tag.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_tag-file_tag.obj `if test -f 'src/file_tag.c'; then $(CYGPATH_W) 'src/file_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/file_tag.c'; fi`
+
+src/tests_test_file_tag-misc.o: src/misc.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -MT src/tests_test_file_tag-misc.o -MD -MP -MF src/$(DEPDIR)/tests_test_file_tag-misc.Tpo -c -o src/tests_test_file_tag-misc.o `test -f 'src/misc.c' || echo '$(srcdir)/'`src/misc.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_tag-misc.Tpo src/$(DEPDIR)/tests_test_file_tag-misc.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/misc.c' object='src/tests_test_file_tag-misc.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_tag-misc.o `test -f 'src/misc.c' || echo '$(srcdir)/'`src/misc.c
+
+src/tests_test_file_tag-misc.obj: src/misc.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -MT src/tests_test_file_tag-misc.obj -MD -MP -MF src/$(DEPDIR)/tests_test_file_tag-misc.Tpo -c -o src/tests_test_file_tag-misc.obj `if test -f 'src/misc.c'; then $(CYGPATH_W) 'src/misc.c'; else $(CYGPATH_W) '$(srcdir)/src/misc.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_tag-misc.Tpo src/$(DEPDIR)/tests_test_file_tag-misc.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/misc.c' object='src/tests_test_file_tag-misc.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_tag-misc.obj `if test -f 'src/misc.c'; then $(CYGPATH_W) 'src/misc.c'; else $(CYGPATH_W) '$(srcdir)/src/misc.c'; fi`
+
+src/tests_test_file_tag-picture.o: src/picture.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -MT src/tests_test_file_tag-picture.o -MD -MP -MF src/$(DEPDIR)/tests_test_file_tag-picture.Tpo -c -o src/tests_test_file_tag-picture.o `test -f 'src/picture.c' || echo '$(srcdir)/'`src/picture.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_tag-picture.Tpo src/$(DEPDIR)/tests_test_file_tag-picture.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/picture.c' object='src/tests_test_file_tag-picture.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_tag-picture.o `test -f 'src/picture.c' || echo '$(srcdir)/'`src/picture.c
+
+src/tests_test_file_tag-picture.obj: src/picture.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -MT src/tests_test_file_tag-picture.obj -MD -MP -MF src/$(DEPDIR)/tests_test_file_tag-picture.Tpo -c -o src/tests_test_file_tag-picture.obj `if test -f 'src/picture.c'; then $(CYGPATH_W) 'src/picture.c'; else $(CYGPATH_W) '$(srcdir)/src/picture.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_tag-picture.Tpo src/$(DEPDIR)/tests_test_file_tag-picture.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/picture.c' object='src/tests_test_file_tag-picture.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_tag_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_tag_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_tag-picture.obj `if test -f 'src/picture.c'; then $(CYGPATH_W) 'src/picture.c'; else $(CYGPATH_W) '$(srcdir)/src/picture.c'; fi`
+
tests/tests_test_misc-test-misc.o: tests/test-misc.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_misc_CPPFLAGS) $(CPPFLAGS) $(tests_test_misc_CFLAGS) $(CFLAGS) -MT tests/tests_test_misc-test-misc.o -MD -MP -MF tests/$(DEPDIR)/tests_test_misc-test-misc.Tpo -c -o tests/tests_test_misc-test-misc.o `test -f 'tests/test-misc.c' || echo '$(srcdir)/'`tests/test-misc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_misc-test-misc.Tpo tests/$(DEPDIR)/tests_test_misc-test-misc.Po
@@ -3179,6 +3392,20 @@ tests/test-file_description.log: tests/test-file_description$(EXEEXT)
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+tests/test-file_info.log: tests/test-file_info$(EXEEXT)
+ @p='tests/test-file_info$(EXEEXT)'; \
+ b='tests/test-file_info'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+tests/test-file_tag.log: tests/test-file_tag$(EXEEXT)
+ @p='tests/test-file_tag$(EXEEXT)'; \
+ b='tests/test-file_tag'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
tests/test-misc.log: tests/test-misc$(EXEEXT)
@p='tests/test-misc$(EXEEXT)'; \
b='tests/test-misc'; \
diff --git a/NEWS b/NEWS
index 4b37378..4629286 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+2.3.5 - 2015-03-09 :
+====================
+
+ * Fix changing tag fields containing certain characters
+ * Fix for truncated CDDB results
+ * Fix changing the artwork description
+ * Avoid a crash when reading FLAC files with no tags
+ * Avoid a crash when reading invalid MP3 files
+ * Further refactoring of the internal file list code
+ * Add several unit tests
+ * Handle empty descriptions in ID3 tag artwork
+ * Build against the patched Debian version of id3lib
+ * Fix compilation when FLAC support is disabled
+ * Avoid a runtime warning in the file browser
+ * Fix a couple of Coverity warnings
+ * Fix string format sign warnings with GCC 5.0
+ * Further improvements to compiler warning flag checking
+ * Marek Černocký’s Czech translation updates
+ * Piotr Drąg’s Polish translation updates
+ * Åka Sikrom’s Norwegian bokmål translation update
+ * Osman Karagöz’s Turkish translation update
+
2.3.4 - 2014-02-06 :
====================
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index 63ae69d..0f0a2da 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -23,881 +26,2112 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --no-quiet, --no-silent
-# print informational messages (default)
-# --no-warn don't display warning messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print more informational messages than default
-# --no-verbose don't print the extra informational messages
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
-# automake: $automake_version
-# autoconf: $autoconf_version
-#
-# Report bugs to <bug-libtool at gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
+VERSION=2.4.6
+package_revision=2.4.6
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES 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, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do 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
+ 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
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
- export $lt_var
- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ eval "if test set = \"\${$_G_var+set}\"; then
+ save_$_G_var=\$$_G_var
+ $_G_var=C
+ export $_G_var
+ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp $nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
-# 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"
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+ _G_progs_list=$1
+ _G_check_func=$2
+ _G_PATH=${3-"$PATH"}
+
+ _G_path_prog_max=0
+ _G_path_prog_found=false
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+ for _G_dir in $_G_PATH; do
+ IFS=$_G_save_IFS
+ test -z "$_G_dir" && _G_dir=.
+ for _G_prog_name in $_G_progs_list; do
+ for _exeext in '' .EXE; do
+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+ func_executable_p "$_G_path_prog" || continue
+ case `"$_G_path_prog" --version 2>&1` in
+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+ *) $_G_check_func $_G_path_prog
+ func_path_progs_result=$func_check_prog_result
+ ;;
+ esac
+ $_G_path_prog_found && break 3
+ done
+ done
+ done
+ IFS=$_G_save_IFS
+ test -z "$func_path_progs_result" && {
+ echo "no acceptable sed could be found in \$PATH" >&2
+ exit 1
+ }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for _G_i in 1 2 3 4 5 6 7; do
+ _G_sed_script=$_G_sed_script$nl$_G_sed_script
+ done
+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+ _G_sed_script=
+
+ func_check_prog_sed ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo '' >> conftest.nl
+ "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+ rm -f conftest.sed
+ SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+ func_check_prog_grep ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ _G_path_prog_max=0
+ printf 0123456789 >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
+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+ GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables. These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" $lt_nl"
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same. If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion. Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+ s/$_G_bs4/&\\
+/g
+ s/^$_G_bs2$_G_dollar/$_G_bs&/
+ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+ s/\n//g"
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
- s@/\./@/@g
- t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-# value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
- "")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
- ;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
- ;;
- *)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
- ;;
- esac
- done
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
+# By convention, finish your script with:
+#
+# exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
-}
+# 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:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
case $progpath in
[\\/]*|[A-Za-z]:\\*) ;;
*[\\/]*)
- progdir=$func_dirname_result
+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
*)
- save_IFS="$IFS"
+ _G_IFS=$IFS
IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -x "$progdir/$progname" && break
done
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
-# Standard options:
opt_dry_run=false
-opt_help=false
opt_quiet=false
opt_verbose=false
-opt_warning=:
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
+# Categories 'all' and 'none' are always available. Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
- $opt_verbose && func_echo ${1+"$@"}
+# By default, display warnings according to 'opt_warning_types'. Set
+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
- # A bug in bash halts the script if the last line of a function
- # fails when set -e is in force, so we need another command to
- # work around that:
- :
-}
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
- # bash bug again:
- :
-}
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
{
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
+ $debug_cmd
+
+ test -t 1 && {
+ # COLORTERM and USE_ANSI_COLORS environment variables take
+ # precedence, because most terminfo databases neglect to describe
+ # whether color sequences are supported.
+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+ if test 1 = "$USE_ANSI_COLORS"; then
+ # Standard ANSI escape sequences
+ tc_reset='[0m'
+ tc_bold='[1m'; tc_standout='[7m'
+ tc_red='[31m'; tc_green='[32m'
+ tc_blue='[34m'; tc_cyan='[36m'
+ else
+ # Otherwise trust the terminfo database after all.
+ test -n "`tput sgr0 2>/dev/null`" && {
+ tc_reset=`tput sgr0`
+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+ tc_standout=$tc_bold
+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+ }
+ fi
+ }
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
+ require_term_colors=:
}
-help="Try \`$progname --help' for more information." ## default
-# func_grep expression filename
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+ # We should try to minimise forks, especially on Windows where they are
+ # unreasonably slow, so skip the feature probes when bash or zsh are
+ # being used:
+ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+ : ${_G_HAVE_ARITH_OP="yes"}
+ : ${_G_HAVE_XSI_OPS="yes"}
+ # The += operator was introduced in bash 3.1
+ case $BASH_VERSION in
+ [12].* | 3.0 | 3.0*) ;;
+ *)
+ : ${_G_HAVE_PLUSEQ_OP="yes"}
+ ;;
+ esac
+ fi
+
+ # _G_HAVE_PLUSEQ_OP
+ # Can be empty, in which case the shell is probed, "yes" if += is
+ # useable or anything else if it does not work.
+ test -z "$_G_HAVE_PLUSEQ_OP" \
+ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+ && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_append ()
+ {
+ $debug_cmd
+
+ eval "$1+=\$2"
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_append ()
+ {
+ $debug_cmd
+
+ eval "$1=\$$1\$2"
+ }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+ eval 'func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
+ }'
+else
+ func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE. For example:
+#
+# func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+ $debug_cmd
+
+ eval _G_current_value='`$ECHO $'$1'`'
+ _G_delim=`expr "$2" : '\(.\)'`
+
+ case $_G_delim$_G_current_value$_G_delim in
+ *"$2$_G_delim"*) ;;
+ *) func_append "$@" ;;
+ esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+ test -z "$_G_HAVE_ARITH_OP" \
+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+ && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+ eval 'func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=$(( $* ))
+ }'
+else
+ func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=`expr "$@"`
+ }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ # If this shell supports suffix pattern removal, then use it to avoid
+ # forking. Hide the definitions single quotes in case the shell chokes
+ # on unsupported syntax...
+ _b='func_basename_result=${1##*/}'
+ _d='case $1 in
+ */*) func_dirname_result=${1%/*}$2 ;;
+ * ) func_dirname_result=$3 ;;
+ esac'
+
+else
+ # ...otherwise fall back to using sed.
+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
+ else
+ func_append func_dirname_result "$2"
+ fi'
+fi
+
+eval 'func_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+ $debug_cmd
+
+ '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+ '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ _G_infix=$1; shift
+ _G_indent=$_G_infix
+ _G_prefix="$progname: $_G_infix: "
+ _G_message=$*
+
+ # Strip color escape sequences before counting printable length
+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+ do
+ test -n "$_G_tc" && {
+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+ }
+ done
+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+
+ func_echo_infix_1_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_infix_1_IFS
+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+ _G_prefix=$_G_indent
+ done
+ IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ $debug_cmd
+
+ func_error "$*"
+ exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
# Check whether EXPRESSION matches any line of FILENAME, without output.
func_grep ()
{
+ $debug_cmd
+
$GREP "$1" "$2" >/dev/null 2>&1
}
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+ test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=${#1}
+ }'
+else
+ func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+ }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
# Make sure the entire path to DIRECTORY-PATH is available.
func_mkdir_p ()
{
- my_directory_path="$1"
- my_dir_list=
+ $debug_cmd
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ _G_directory_path=$1
+ _G_dir_list=
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+ # Protect directory names starting with '-'
+ case $_G_directory_path in
+ -*) _G_directory_path=./$_G_directory_path ;;
esac
# While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
+ while test ! -d "$_G_directory_path"; do
# ...make a list in topmost first order. Use a colon delimited
# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
+ _G_dir_list=$_G_directory_path:$_G_dir_list
# If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
+ case $_G_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
- IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
+ func_mkdir_p_IFS=$IFS; IFS=:
+ for _G_dir in $_G_dir_list; do
+ IFS=$func_mkdir_p_IFS
+ # mkdir can fail with a 'File exist' error if two processes
# try to create one of the directories concurrently. Don't
# stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
+ $MKDIR "$_G_dir" 2>/dev/null || :
done
- IFS="$save_mkdir_p_IFS"
+ IFS=$func_mkdir_p_IFS
# Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
+ test -d "$_G_directory_path" || \
+ func_fatal_error "Failed to create '$1'"
fi
}
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
# 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.
+# given, BASENAME is the basename for that directory.
func_mktempdir ()
{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
+ $debug_cmd
+
+ _G_template=${TMPDIR-/tmp}/${1-$progname}
- if test "$opt_dry_run" = ":"; then
+ if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
+ _G_tmpdir=$_G_template-$$
else
# If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
- if test ! -d "$my_tmpdir"; then
+ if test ! -d "$_G_tmpdir"; then
# Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ _G_tmpdir=$_G_template-${RANDOM-0}$$
- save_mktempdir_umask=`umask`
+ func_mktempdir_umask=`umask`
umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
+ $MKDIR "$_G_tmpdir"
+ umask $func_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ test -d "$_G_tmpdir" || \
+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+ fi
+
+ $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+ $debug_cmd
+
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ _G_pathcar='s|^/\([^/]*\).*$|\1|'
+ _G_pathcdr='s|^/[^/]*||'
+ _G_removedotparts=':dotsl
+ s|/\./|/|g
+ t dotsl
+ s|/\.$|/|'
+ _G_collapseslashes='s|/\{1,\}|/|g'
+ _G_finalslash='s|/*$|/|'
+
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test / = "$func_normal_abspath_tpath"; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result"; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+ $debug_cmd
+
+ $opt_quiet || func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+ $debug_cmd
+
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=$func_dirname_result
+ if test -z "$func_relative_path_tlibdir"; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test -n "$func_stripname_result"; then
+ func_append func_relative_path_result "/$func_stripname_result"
+ fi
+
+ # Normalisation. If bindir is libdir, return '.' else relative path.
+ if test -n "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
fi
- $ECHO "$my_tmpdir"
+ test -n "$func_relative_path_result" || func_relative_path_result=.
+
+ :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
+{
+ $debug_cmd
+
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
+ *[\\\`\"\$]*)
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
+
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
+ ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+ ;;
+ esac
+
+ if test -n "$func_quote_for_eval_result"; then
+ func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+ $debug_cmd
+
+ case $1 in
+ *[\\\`\"]*)
+ _G_arg=`$ECHO "$1" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ _G_arg=$1 ;;
+ esac
+
+ case $_G_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_arg=\"$_G_arg\"
+ ;;
+ esac
+
+ func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_stripname ()
+ {
+ $debug_cmd
+
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary variable first.
+ func_stripname_result=$3
+ func_stripname_result=${func_stripname_result#"$1"}
+ func_stripname_result=${func_stripname_result%"$2"}
+ }'
+else
+ func_stripname ()
+ {
+ $debug_cmd
+
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+ esac
+ }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
+
+ $opt_dry_run || {
+ eval "$_G_cmd"
+ _G_status=$?
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ $opt_quiet || {
+ func_quote_for_expand "$_G_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ $opt_dry_run || {
+ eval "$_G_user_locale
+ $_G_cmd"
+ _G_status=$?
+ eval "$_G_safe_locale"
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result. All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+ $debug_cmd
+
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $debug_cmd
+
+ $opt_verbose && func_echo "$*"
+
+ :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+ $debug_cmd
+
+ # CATEGORY must be in the warning_categories list!
+ case " $warning_categories " in
+ *" $1 "*) ;;
+ *) func_internal_error "invalid warning category '$1'" ;;
+ esac
+
+ _G_category=$1
+ shift
+
+ case " $opt_warning_types " in
+ *" $_G_category "*) $warning_func ${1+"$@"} ;;
+ esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+ $debug_cmd
+
+ printf '%s\n%s\n' "$1" "$2" \
+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false. Use it like this:
+#
+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+ $debug_cmd
+
+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+# #!/bin/sh
+# . relative/path/to/funclib.sh
+# . relative/path/to/options-parser
+# scriptversion=1.0
+# func_options ${1+"$@"}
+# eval set dummy "$func_options_result"; shift
+# ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'. Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+ --debug enable verbose shell tracing
+ -W, --warnings=CATEGORY
+ report the warnings falling in CATEGORY [all]
+ -v, --verbose verbosely report processing
+ --version print version information and exit
+ -h, --help print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+ 'all' show all warnings
+ 'none' turn off all the warnings
+ 'error' warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+ $debug_cmd
+
+ func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not accept hook functions." ;;
+ esac
+
+ eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+ $debug_cmd
+
+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+ esac
+
+ eval _G_hook_fns=\$$1_hooks; shift
+
+ for _G_hook in $_G_hook_fns; do
+ eval $_G_hook '"$@"'
+
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ done
+
+ func_quote_for_eval ${1+"$@"}
+ func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. Like this:
+#
+# my_options_prep ()
+# {
+# $debug_cmd
+#
+# # Extend the existing usage message.
+# usage_message=$usage_message'
+# -s, --silent don'\''t print informational messages
+# '
+#
+# func_quote_for_eval ${1+"$@"}
+# my_options_prep_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_options_prep my_options_prep
+#
+#
+# my_silent_option ()
+# {
+# $debug_cmd
+#
+# # Note that for efficiency, we parse as many options as we can
+# # recognise in a loop before passing the remainder back to the
+# # caller on the first unrecognised argument we encounter.
+# while test $# -gt 0; do
+# opt=$1; shift
+# case $opt in
+# --silent|-s) opt_silent=: ;;
+# # Separate non-argument short options:
+# -s*) func_split_short_opt "$_G_opt"
+# set dummy "$func_split_short_opt_name" \
+# "-$func_split_short_opt_arg" ${1+"$@"}
+# shift
+# ;;
+# *) set dummy "$_G_opt" "$*"; shift; break ;;
+# esac
+# done
+#
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_parse_options my_silent_option
+#
+#
+# my_option_validation ()
+# {
+# $debug_cmd
+#
+# $opt_silent && $opt_verbose && func_fatal_help "\
+# '--silent' and '--verbose' options are mutually exclusive."
+#
+# func_quote_for_eval ${1+"$@"}
+# my_option_validation_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse. It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+ $debug_cmd
+
+ func_options_prep ${1+"$@"}
+ eval func_parse_options \
+ ${func_options_prep_result+"$func_options_prep_result"}
+ eval func_validate_options \
+ ${func_parse_options_result+"$func_parse_options_result"}
+
+ eval func_run_hooks func_options \
+ ${func_validate_options_result+"$func_validate_options_result"}
+
+ # save modified positional parameters for caller
+ func_options_result=$func_run_hooks_result
}
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters. If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
{
- case $1 in
- *[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
+ $debug_cmd
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
- ;;
- *)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
- esac
+ # Option defaults:
+ opt_verbose=false
+ opt_warning_types=
+
+ func_run_hooks func_options_prep ${1+"$@"}
+
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
}
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
{
- case $1 in
- *[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
- -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
- *)
- my_arg="$1" ;;
- esac
+ $debug_cmd
- case $my_arg in
- # Double-quote args containing shell metacharacters to delay
- # word splitting and command substitution for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- my_arg="\"$my_arg\""
- ;;
- esac
+ func_parse_options_result=
- func_quote_for_expand_result="$my_arg"
-}
+ # this just eases exit handling
+ while test $# -gt 0; do
+ # Defer to hook functions for initial option parsing, so they
+ # get priority in the event of reusing an option name.
+ func_run_hooks func_parse_options ${1+"$@"}
+ # Adjust func_parse_options positional parameters to match
+ eval set dummy "$func_run_hooks_result"; shift
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ # Break out of the loop if we already parsed every option.
+ test $# -gt 0 || break
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --debug|-x) debug_cmd='set -x'
+ func_echo "enabling shell trace mode"
+ $debug_cmd
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ set dummy --warnings none ${1+"$@"}
+ shift
+ ;;
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
+ --warnings|--warning|-W)
+ test $# = 0 && func_missing_arg $_G_opt && break
+ case " $warning_categories $1" in
+ *" $1 "*)
+ # trailing space prevents matching last $1 above
+ func_append_uniq opt_warning_types " $1"
+ ;;
+ *all)
+ opt_warning_types=$warning_categories
+ ;;
+ *none)
+ opt_warning_types=none
+ warning_func=:
+ ;;
+ *error)
+ opt_warning_types=$warning_categories
+ warning_func=func_fatal_error
+ ;;
+ *)
+ func_fatal_error \
+ "unsupported warning category: '$1'"
+ ;;
+ esac
+ shift
+ ;;
+
+ --verbose|-v) opt_verbose=: ;;
+ --version) func_version ;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+
+ # Separate optargs to long options (plugins may need this):
+ --*=*) func_split_equals "$_G_opt"
+ set dummy "$func_split_equals_lhs" \
+ "$func_split_equals_rhs" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate optargs to short options:
+ -W*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate non-argument short options:
+ -\?*|-h*|-v*|-x*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
+
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
}
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it. Use the saved locale for evaluation.
-func_show_eval_locale ()
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ # Display all warnings if -W was not given.
+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
- $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
-}
+ func_run_hooks func_validate_options ${1+"$@"}
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result. All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
+ # Bail if the options were screwed!
+ $exit_cmd $EXIT_FAILURE
+
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
}
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
- $opt_debug
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
- s/^# *$//
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
- p
- }' < "$progpath"
- exit $?
-}
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
- s/^# *$//
- s/\$progname/'$progname'/
- p
- }' < "$progpath"
- echo
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
+ eval \$ECHO \""Usage: $usage"\"
+ eval \$ECHO \""$fatal_help"\"
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
-
- $SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
- s/^# //
- s/^# *$//
- s*\$progname*'$progname'*
- s*\$host*'"$host"'*
- s*\$SHELL*'"$SHELL"'*
- s*\$LTCC*'"$LTCC"'*
- s*\$LTCFLAGS*'"$LTCFLAGS"'*
- s*\$LD*'"$LD"'*
- s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
- p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message"
+ exit 0
}
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
# Echo program name prefixed message to standard error and set global
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
+ $debug_cmd
- func_error "missing argument for $1."
+ func_error "Missing argument for '$1'."
exit_cmd=exit
}
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=${1%%=*}
+ func_split_equals_rhs=${1#*=}
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+ func_split_equals_rhs=
+ test "x$func_split_equals_lhs" = "x$1" \
+ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+ }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
# Set func_split_short_opt_name and func_split_short_opt_arg shell
# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+ }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ $debug_cmd
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+ func_usage_message
+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+ exit 0
+}
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
+ $debug_cmd
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+ eval \$ECHO \""Usage: $usage"\"
+ echo
+ $SED -n 's|^# ||
+ /^Written by/{
+ x;p;x
+ }
+ h
+ /^Written by/q' < "$progpath"
+ echo
+ eval \$ECHO \""$usage_message"\"
+}
-exit_cmd=:
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $debug_cmd
+ printf '%s\n' "$progname $scriptversion"
+ $SED -n '
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
+ }
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+ p
+ }
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
+ exit $?
+}
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
-# 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.
-exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+ $debug_cmd
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+ _G_message=$*
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
-# func_arith arithmetic-term...
-func_arith ()
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+ $debug_cmd
+ $warning_func ${1+"$@"}
+}
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+ -n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --mode=MODE use operation mode MODE
+ --no-warnings equivalent to '-Wnone'
+ --preserve-dup-deps don't remove duplicate dependency libraries
+ --quiet, --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ -v, --verbose print more informational messages than default
+ --version print version information
+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+ -h, --help, --help-all print short, long, or detailed help message
+"
-# func_lo2o object
-func_lo2o ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+ host-triplet: $host
+ shell: $SHELL
+ compiler: $LTCC
+ compiler flags: $LTCFLAGS
+ linker: $LD (gnu? $with_gnu_ld)
+ version: $progname (GNU libtool) 2.4.6
+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool at gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_lo2o ()
+ {
+ case $1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ * ) func_lo2o_result=$1 ;;
+ esac
+ }'
+
+ # func_xform LIBOBJ-OR-SOURCE
+ # ---------------------------
+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+ # suffix to a '.lo' libtool-object suffix.
+ eval 'func_xform ()
+ {
+ func_xform_result=${1%.*}.lo
+ }'
+else
+ # ...otherwise fall back to using sed.
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+ }
+
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+ }
+fi
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
func_fatal_configuration ()
{
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
+ func__fatal_error ${1+"$@"} \
+ "See the $PACKAGE documentation for more information." \
+ "Fatal configuration error."
}
# func_config
+# -----------
# Display the configuration for all the tags in this script.
func_config ()
{
@@ -915,17 +2149,19 @@ func_config ()
exit $?
}
+
# func_features
+# -------------
# Display the features supported by this script.
func_features ()
{
echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
echo "enable shared libraries"
else
echo "disable shared libraries"
fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
echo "enable static libraries"
else
echo "disable static libraries"
@@ -934,314 +2170,350 @@ func_features ()
exit $?
}
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
# Verify that TAGNAME is valid, and either flag an error and exit, or
# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
# variable here.
func_enable_tag ()
{
- # Global variable:
- tagname="$1"
+ # Global variable:
+ tagname=$1
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
- # Validate tagname.
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
*)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- taglist="$taglist $tagname"
-
- # Evaluate the configuration. Be careful to quote the path
- # and the sed script, to avoid splitting on whitespace, but
- # also don't use non-portable quotes within backquotes within
- # quotes we have to do it in 2 steps:
- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- eval "$extractedcf"
- else
- func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
}
+
# func_check_version_match
+# ------------------------
# Ensure that we are using m4 macros, and libtool script from the same
# release of libtool.
func_check_version_match ()
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from an older release.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- else
- cat >&2 <<_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
$progname: but the definition of this LT_INIT comes from revision $macro_revision.
$progname: You should recreate aclocal.m4 with macros from revision $package_revision
$progname: of $PACKAGE $VERSION and run autoconf again.
_LT_EOF
- fi
+ fi
- exit $EXIT_MISMATCH
- fi
+ exit $EXIT_MISMATCH
+ fi
}
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+ $debug_mode
+ # Option defaults:
+ opt_config=false
+ opt_dlopen=
+ opt_dry_run=false
+ opt_help=false
+ opt_mode=
+ opt_preserve_dup_deps=false
+ opt_quiet=false
+ nonopt=
+ preserve_args=
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
+
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
{
- # this just eases exit handling
- while test $# -gt 0; do
- opt="$1"
- shift
- case $opt in
- --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
- $opt_debug
- ;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
- shift
- ;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
- shift
- ;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-warning|--no-warn)
- opt_warning=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
- opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
- ;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
- ;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
- shift
- ;;
-
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
-
- # Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- shift
- ;;
-
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
-
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
- esac
- done
+ $debug_cmd
- # Validate options:
+ # Perform our own loop to consume as many options as possible in
+ # each iteration.
+ while test $# -gt 0; do
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
+ ;;
+
+ --config) func_config ;;
+
+ --dlopen|-dlopen)
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_preserve_dup_deps=: ;;
+
+ --features) func_features ;;
+
+ --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+
+ --help) opt_help=: ;;
+
+ --help-all) opt_help=': help-all' ;;
+
+ --mode) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_mode=$1
+ case $1 in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $_G_opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+ shift
+ ;;
+
+ --no-silent|--no-quiet)
+ opt_quiet=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ opt_warning=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-verbose)
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --silent|--quiet)
+ opt_quiet=:
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --tag) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_tag=$1
+ func_append preserve_args " $_G_opt $1"
+ func_enable_tag "$1"
+ shift
+ ;;
+
+ --verbose|-v) opt_quiet=false
+ opt_verbose=:
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ # An option not handled by this hook function:
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+ # save first non-option argument
+ if test 0 -lt $#; then
+ nonopt=$1
+ shift
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # preserve --debug
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ case $host in
+ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+ func_error "unrecognized option '-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ # Change the help message to a mode-specific one.
+ generic_help=$help
+ help="Try '$progname --help --mode=$opt_mode' for more information."
+ }
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
+ # Pass back the unparsed argument list
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
}
+func_add_hook func_validate_options libtool_validate_options
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
## ----------- ##
## Main. ##
## ----------- ##
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# 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.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function is only a basic sanity check; it will hardly flush out
# determined imposters.
func_lalib_p ()
{
test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function implements the same check as func_lalib_p without
# resorting to external programs. To this end, it redirects stdin and
# closes it afterwards, without saving the original file descriptor.
# As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
+# fatal anyway. Works if 'file' does not exist.
func_lalib_unsafe_p ()
{
lalib_p=no
@@ -1249,13 +2521,13 @@ func_lalib_unsafe_p ()
for lalib_p_l in 1 2 3 4
do
read lalib_p_line
- case "$lalib_p_line" in
+ case $lalib_p_line in
\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
esac
done
exec 0<&5 5<&-
fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
}
# func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@ func_lalib_unsafe_p ()
# determined imposters.
func_ltwrapper_script_p ()
{
- func_lalib_p "$1"
+ test -f "$1" &&
+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@ func_ltwrapper_scriptname ()
{
func_dirname_and_basename "$1" "" "."
func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
}
# func_ltwrapper_p file
@@ -1308,11 +2581,13 @@ func_ltwrapper_p ()
# FAIL_CMD may read-access the current command in variable CMD!
func_execute_cmds ()
{
- $opt_debug
+ $debug_cmd
+
save_ifs=$IFS; IFS='~'
for cmd in $1; do
- IFS=$save_ifs
+ IFS=$sp$nl
eval cmd=\"$cmd\"
+ IFS=$save_ifs
func_show_eval "$cmd" "${2-:}"
done
IFS=$save_ifs
@@ -1324,10 +2599,11 @@ func_execute_cmds ()
# Note that it is not necessary on cygwin/mingw to append a dot to
# FILE even if both FILE 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.
+# 'FILE.' does not work on cygwin managed mounts.
func_source ()
{
- $opt_debug
+ $debug_cmd
+
case $1 in
*/* | *\\*) . "$1" ;;
*) . "./$1" ;;
@@ -1354,10 +2630,10 @@ func_resolve_sysroot ()
# store the result into func_replace_sysroot_result.
func_replace_sysroot ()
{
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
?*:"$lt_sysroot"*)
func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
;;
*)
# Including no sysroot.
@@ -1374,7 +2650,8 @@ func_replace_sysroot ()
# arg is usually of the form 'gcc ...'
func_infer_tag ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1393,7 +2670,7 @@ func_infer_tag ()
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`"
+ 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.
@@ -1418,7 +2695,7 @@ func_infer_tag ()
# line option must be used.
if test -z "$tagname"; then
func_echo "unable to infer tagged configuration"
- func_fatal_error "specify a tag with \`--tag'"
+ func_fatal_error "specify a tag with '--tag'"
# else
# func_verbose "using $tagname tagged configuration"
fi
@@ -1434,15 +2711,15 @@ func_infer_tag ()
# but don't create it if we're doing a dry run.
func_write_libtool_object ()
{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
else
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
else
write_oldobj=none
fi
@@ -1450,7 +2727,7 @@ func_write_libtool_object ()
$opt_dry_run || {
cat >${write_libobj}T <<EOF
# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -1462,7 +2739,7 @@ pic_object=$write_lobj
non_pic_object=$write_oldobj
EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
}
}
@@ -1482,8 +2759,9 @@ EOF
# be empty on error (or when ARG is empty)
func_convert_core_file_wine_to_w32 ()
{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
+ $debug_cmd
+
+ func_convert_core_file_wine_to_w32_result=$1
if test -n "$1"; then
# Unfortunately, winepath does not exit with a non-zero error code, so we
# are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@ func_convert_core_file_wine_to_w32 ()
# *an error message* to stdout. So we must check for both error code of
# zero AND non-empty stdout, which explains the odd construction:
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
+ $SED -e "$sed_naive_backslashify"`
else
func_convert_core_file_wine_to_w32_result=
fi
@@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 ()
# are convertible, then the result may be empty.
func_convert_core_path_wine_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ func_convert_core_path_wine_to_w32_result=
if test -n "$1"; then
oldIFS=$IFS
IFS=:
for func_convert_core_path_wine_to_w32_f in $1; do
IFS=$oldIFS
func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -n "$func_convert_core_file_wine_to_w32_result"; then
if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
else
func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
fi
@@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 ()
# environment variable; do not put it in $PATH.
func_cygpath ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@ func_cygpath ()
fi
else
func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
fi
}
#end: func_cygpath
@@ -1574,10 +2854,11 @@ func_cygpath ()
# result in func_convert_core_msys_to_w32_result.
func_convert_core_msys_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# awkward: cmd appends spaces to result
func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
}
#end: func_convert_core_msys_to_w32
@@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 ()
# func_to_host_file_result to ARG1).
func_convert_file_check ()
{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
+ $debug_cmd
+
+ if test -z "$2" && test -n "$1"; then
func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
+ func_error " '$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
fi
}
# end func_convert_file_check
@@ -1606,10 +2888,11 @@ func_convert_file_check ()
# func_to_host_file_result to a simplistic fallback value (see below).
func_convert_path_check ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$4" && test -n "$3"; then
func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
+ func_error " '$3'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This is a deliberately simplistic "conversion" and
# should not be "improved". See libtool.info.
@@ -1618,7 +2901,7 @@ func_convert_path_check ()
func_to_host_path_result=`echo "$3" |
$SED -e "$lt_replace_pathsep_chars"`
else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
fi
fi
}
@@ -1630,9 +2913,10 @@ func_convert_path_check ()
# and appending REPL if ORIG matches BACKPAT.
func_convert_path_front_back_pathsep ()
{
- $opt_debug
+ $debug_cmd
+
case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
;;
esac
case $4 in
@@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep ()
##################################################
# $build to $host FILE NAME CONVERSION FUNCTIONS #
##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep ()
# in func_to_host_file_result.
func_to_host_file ()
{
- $opt_debug
+ $debug_cmd
+
$to_host_file_cmd "$1"
}
# end func_to_host_file
@@ -1669,7 +2954,8 @@ func_to_host_file ()
# in (the comma separated) LAZY, no conversion takes place.
func_to_tool_file ()
{
- $opt_debug
+ $debug_cmd
+
case ,$2, in
*,"$to_tool_file_cmd",*)
func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@ func_to_tool_file ()
# Copy ARG to func_to_host_file_result.
func_convert_file_noop ()
{
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
}
# end func_convert_file_noop
@@ -1698,11 +2984,12 @@ func_convert_file_noop ()
# func_to_host_file_result.
func_convert_file_msys_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 ()
# func_to_host_file_result.
func_convert_file_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# because $build is cygwin, we call "the" cygpath in $PATH; no need to use
# LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 ()
# and a working winepath. Returns result in func_to_host_file_result.
func_convert_file_nix_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_file_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin ()
# in func_to_host_file_result.
func_convert_file_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
func_convert_core_file_wine_to_w32 "$1"
func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin ()
#############################################
# $build to $host PATH CONVERSION FUNCTIONS #
#############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin ()
to_host_path_cmd=
func_init_to_host_path_cmd ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$to_host_path_cmd"; then
func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
fi
}
@@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd ()
# in func_to_host_path_result.
func_to_host_path ()
{
- $opt_debug
+ $debug_cmd
+
func_init_to_host_path_cmd
$to_host_path_cmd "$1"
}
@@ -1829,7 +3122,7 @@ func_to_host_path ()
# Copy ARG to func_to_host_path_result.
func_convert_path_noop ()
{
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
}
# end func_convert_path_noop
@@ -1840,8 +3133,9 @@ func_convert_path_noop ()
# func_to_host_path_result.
func_convert_path_msys_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from ARG. MSYS
# behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@ func_convert_path_msys_to_w32 ()
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result=$func_convert_core_msys_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 ()
# func_to_host_file_result.
func_convert_path_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
@@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 ()
# a working winepath. Returns result in func_to_host_file_result.
func_convert_path_nix_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_path_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin ()
# func_to_host_file_result.
func_convert_path_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin ()
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin ()
# end func_convert_path_nix_to_cygwin
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+ $debug_cmd
+
+ func_dll_def_p_tmp=`$SED -n \
+ -e 's/^[ ]*//' \
+ -e '/^\(;.*\)*$/d' \
+ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+ -e q \
+ "$1"`
+ test DEF = "$func_dll_def_p_tmp"
+}
+
+
# func_mode_compile arg...
func_mode_compile ()
{
- $opt_debug
+ $debug_cmd
+
# Get the compilation command and the source file.
base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output=
arg_mode=normal
@@ -1965,12 +3281,12 @@ func_mode_compile ()
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg="$arg"
+ lastarg=$arg
arg_mode=normal
;;
target )
- libobj="$arg"
+ libobj=$arg
arg_mode=normal
continue
;;
@@ -1980,7 +3296,7 @@ func_mode_compile ()
case $arg in
-o)
test -n "$libobj" && \
- func_fatal_error "you cannot specify \`-o' more than once"
+ func_fatal_error "you cannot specify '-o' more than once"
arg_mode=target
continue
;;
@@ -2009,12 +3325,12 @@ func_mode_compile ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
lastarg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for arg in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_append_quoted lastarg "$arg"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
@@ -2027,8 +3343,8 @@ func_mode_compile ()
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
- lastarg="$srcfile"
- srcfile="$arg"
+ lastarg=$srcfile
+ srcfile=$arg
;;
esac # case $arg
;;
@@ -2043,13 +3359,13 @@ func_mode_compile ()
func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- func_fatal_error "you must specify a target with \`-o'"
+ func_fatal_error "you must specify a target with '-o'"
;;
*)
# Get the name of the library object.
test -z "$libobj" && {
func_basename "$srcfile"
- libobj="$func_basename_result"
+ libobj=$func_basename_result
}
;;
esac
@@ -2069,7 +3385,7 @@ func_mode_compile ()
case $libobj in
*.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
+ func_fatal_error "cannot determine name of library object from '$libobj'"
;;
esac
@@ -2078,8 +3394,8 @@ func_mode_compile ()
for arg in $later; do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes = "$build_libtool_libs" \
+ || func_fatal_configuration "cannot build a shared library"
build_old_libs=no
continue
;;
@@ -2105,17 +3421,17 @@ func_mode_compile ()
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
test -z "$base_compile" && \
func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
removelist="$obj $lobj $libobj ${libobj}T"
else
removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@ func_mode_compile ()
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
# Calculate the filename of the output object if compiler does
# not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+ lockfile=$output_obj.lock
else
output_obj=
need_locks=no
@@ -2145,12 +3461,12 @@ func_mode_compile ()
# 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
+ if test yes = "$need_locks"; then
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
sleep 2
done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
if test -f "$lockfile"; then
$ECHO "\
*** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@ func_mode_compile ()
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2180,11 +3496,11 @@ compiler."
qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
@@ -2201,7 +3517,7 @@ compiler."
func_show_eval_locale "$command" \
'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2228,20 +3544,20 @@ compiler."
fi
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
suppress_output=' >/dev/null 2>&1'
fi
fi
# Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
# Don't build PIC code
command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
func_append command " -o $obj"
fi
@@ -2250,7 +3566,7 @@ compiler."
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2281,7 +3597,7 @@ compiler."
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
# Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
removelist=$lockfile
$RM "$lockfile"
fi
@@ -2291,7 +3607,7 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -2311,7 +3627,7 @@ func_mode_help ()
Remove files from the build directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@ This mode accepts the following additional options:
-no-suppress do not suppress compiler output for multiple passes
-prefer-pic try to build PIC objects only
-prefer-non-pic try to build non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
+ -shared do not build a '.o' file suitable for static linking
+ -static only build a '.o' file suitable for static linking
-Wc,FLAG pass FLAG directly to the compiler
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
from the given SOURCEFILE.
The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
;;
execute)
@@ -2352,7 +3668,7 @@ This mode accepts the following additional options:
-dlopen FILE add the directory containing FILE to the library path
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
flags.
If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries.
Each LIBDIR is a directory that contains libtool libraries.
The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
;;
install)
@@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed."
Install executables or libraries.
INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially:
-avoid-version do not add a version suffix if possible
-bindir BINDIR specify path to binaries directory (for systems where
libraries must be found in the PATH setting at runtime)
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially:
-no-install link a not-installable executable
-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
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
-precious-files-regex REGEX
don't remove output files matching REGEX
-release RELEASE specify package release information
@@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially:
-Xlinker FLAG pass linker-specific FLAG directly to the linker
-XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
-Every other argument is treated as a filename. Files ending in \`.la' are
+Every other argument is treated as a filename. Files ending in '.la' are
treated as uninstalled libtool libraries, other files are standard or library
object files.
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
required, except when creating a convenience library.
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
is created, otherwise an executable program is created."
;;
@@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created."
Remove libraries from an installation directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
;;
esac
echo
- $ECHO "Try \`$progname --help' for more information about other modes."
+ $ECHO "Try '$progname --help' for more information about other modes."
}
# Now that we've collected a possible --mode arg, show help if necessary
if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
func_mode_help
else
{
@@ -2491,7 +3808,7 @@ if $opt_help; then
for opt_mode in compile link execute install finish uninstall clean; do
func_mode_help
done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
{
func_help noexit
for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@ if $opt_help; then
func_mode_help
done
} |
- sed '1d
+ $SED '1d
/^When reporting/,/^Report/{
H
d
@@ -2516,16 +3833,17 @@ fi
# func_mode_execute arg...
func_mode_execute ()
{
- $opt_debug
+ $debug_cmd
+
# The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
test -z "$cmd" && \
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
for file in $opt_dlopen; do
test -f "$file" \
- || func_fatal_help "\`$file' is not a file"
+ || func_fatal_help "'$file' is not a file"
dir=
case $file in
@@ -2535,7 +3853,7 @@ func_mode_execute ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$lib' is not a valid libtool archive"
+ || func_fatal_help "'$lib' is not a valid libtool archive"
# Read the libtool library.
dlname=
@@ -2546,18 +3864,18 @@ func_mode_execute ()
if test -z "$dlname"; then
# Warn if it was a shared library.
test -n "$library_names" && \
- func_warning "\`$file' was not linked with \`-export-dynamic'"
+ func_warning "'$file' was not linked with '-export-dynamic'"
continue
fi
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
if test -f "$dir/$objdir/$dlname"; then
func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
fi
fi
;;
@@ -2565,18 +3883,18 @@ func_mode_execute ()
*.lo)
# Just add the directory containing the .lo file.
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
;;
*)
- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
continue
;;
esac
# Get the absolute pathname.
absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
# Now add the directory to shlibpath_var.
if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@ func_mode_execute ()
# This variable tells wrapper scripts just to set shlibpath_var
# rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
# Check if any of the arguments is a wrapper script.
args=
@@ -2601,12 +3919,12 @@ func_mode_execute ()
if func_ltwrapper_script_p "$file"; then
func_source "$file"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
elif func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
func_source "$func_ltwrapper_scriptname_result"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
fi
;;
esac
@@ -2614,7 +3932,15 @@ func_mode_execute ()
func_append_quoted args "$file"
done
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
if test -n "$shlibpath_var"; then
# Export the shlibpath_var.
eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@ func_mode_execute ()
done
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
fi
}
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
- $opt_debug
+ $debug_cmd
+
libs=
libdirs=
admincmds=
@@ -2663,11 +3982,11 @@ func_mode_finish ()
if func_lalib_unsafe_p "$opt"; then
func_append libs " $opt"
else
- func_warning "\`$opt' is not a valid libtool archive"
+ func_warning "'$opt' is not a valid libtool archive"
fi
else
- func_fatal_error "invalid argument \`$opt'"
+ func_fatal_error "invalid argument '$opt'"
fi
done
@@ -2682,12 +4001,12 @@ func_mode_finish ()
# Remove sysroot references
if $opt_dry_run; then
for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ echo "removing references to $lt_sysroot and '=' prefixes from $lib"
done
else
tmpdir=`func_mktempdir`
for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
> $tmpdir/tmp-la
mv -f $tmpdir/tmp-la $lib
done
@@ -2712,7 +4031,7 @@ func_mode_finish ()
fi
# Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@ func_mode_finish ()
echo
echo "If you ever happen to want to link against installed libraries"
echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "specify the full pathname of the library, or use the '-LLIBDIR'"
echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " - add LIBDIR to the '$shlibpath_var' environment variable"
echo " during execution"
fi
if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " - add LIBDIR to the '$runpath_var' environment variable"
echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
eval flag=\"$hardcode_libdir_flag_spec\"
- $ECHO " - use the \`$flag' linker flag"
+ $ECHO " - use the '$flag' linker flag"
fi
if test -n "$admincmds"; then
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
fi
echo
@@ -2762,18 +4081,20 @@ func_mode_finish ()
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
# func_mode_install arg...
func_mode_install ()
{
- $opt_debug
+ $debug_cmd
+
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@ func_mode_install ()
opts=
prev=
install_type=
- isdir=no
+ isdir=false
stripme=
no_mode=:
for arg
@@ -2813,7 +4134,7 @@ func_mode_install ()
fi
case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
-f)
if $install_cp; then :; else
prev=$arg
@@ -2831,7 +4152,7 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ if test X-m = "X$prev" && test -n "$install_override_mode"; then
arg2=$install_override_mode
no_mode=false
fi
@@ -2856,7 +4177,7 @@ func_mode_install ()
func_fatal_help "you must specify an install program"
test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
+ func_fatal_help "the '$prev' option requires an argument"
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
@@ -2878,19 +4199,19 @@ func_mode_install ()
dest=$func_stripname_result
# Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
destname=
else
func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
test "$#" -gt 1 && \
- func_fatal_help "\`$dest' is not a directory"
+ func_fatal_help "'$dest' is not a directory"
fi
case $destdir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@ func_mode_install ()
case $file in
*.lo) ;;
*)
- func_fatal_help "\`$destdir' must be an absolute directory name"
+ func_fatal_help "'$destdir' must be an absolute directory name"
;;
esac
done
@@ -2908,7 +4229,7 @@ func_mode_install ()
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
staticlibs=
future_libdirs=
@@ -2928,7 +4249,7 @@ func_mode_install ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$file' is not a valid libtool archive"
+ || func_fatal_help "'$file' is not a valid libtool archive"
library_names=
old_library=
@@ -2950,7 +4271,7 @@ func_mode_install ()
fi
func_dirname "$file" "/" ""
- dir="$func_dirname_result"
+ dir=$func_dirname_result
func_append dir "$objdir"
if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@ func_mode_install ()
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@ func_mode_install ()
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
- func_warning "relinking \`$file'"
+ func_warning "relinking '$file'"
func_show_eval "$relink_command" \
- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
fi
# See the names of the shared library.
set dummy $library_names; shift
if test -n "$1"; then
- realname="$1"
+ realname=$1
shift
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ srcname=$realname
+ test -n "$relink_command" && srcname=${realname}T
# Install the shared library and build the symlinks.
func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
- tstripme="$stripme"
+ tstripme=$stripme
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
- tstripme=""
+ tstripme=
+ ;;
+ esac
+ ;;
+ os2*)
+ case $realname in
+ *_dll.a)
+ tstripme=
;;
esac
;;
@@ -3006,7 +4334,7 @@ func_mode_install ()
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
- # Try `ln -sf' first, because the `ln' binary might depend on
+ # 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
@@ -3017,14 +4345,14 @@ func_mode_install ()
fi
# Do each command in the postinstall commands.
- lib="$destdir/$realname"
+ lib=$destdir/$realname
func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
# Install the pseudo-library for information purposes.
func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
+ name=$func_basename_result
+ instname=$dir/${name}i
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@ func_mode_install ()
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@ func_mode_install ()
staticdest=$func_lo2o_result
;;
*.$objext)
- staticdest="$destfile"
+ staticdest=$destfile
destfile=
;;
*)
- func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ func_fatal_help "cannot copy a libtool object to '$destfile'"
;;
esac
@@ -3063,7 +4391,7 @@ func_mode_install ()
func_show_eval "$install_prog $file $destfile" 'exit $?'
# Install the old object if enabled.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
# Deduce the name of the old-style object file.
func_lo2o "$file"
staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@ func_mode_install ()
*)
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# If the file is missing, and there is a .exe on the end, strip it
# because it is most likely a libtool script we actually want to
# install
- stripped_ext=""
+ stripped_ext=
case $file in
*.exe)
if test ! -f "$file"; then
func_stripname '' '.exe' "$file"
file=$func_stripname_result
- stripped_ext=".exe"
+ stripped_ext=.exe
fi
;;
esac
@@ -3119,19 +4447,19 @@ func_mode_install ()
# Check the variables that should have been set.
test -z "$generated_by_libtool_version" && \
- func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+ func_fatal_error "invalid libtool wrapper script '$wrapper'"
- finalize=yes
+ finalize=:
for lib in $notinst_deplibs; do
# Check to see that each library is installed.
libdir=
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
if test -n "$libdir" && test ! -f "$libfile"; then
- func_warning "\`$lib' has not been installed in \`$libdir'"
- finalize=no
+ func_warning "'$lib' has not been installed in '$libdir'"
+ finalize=false
fi
done
@@ -3139,29 +4467,29 @@ func_mode_install ()
func_source "$wrapper"
outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
+ if test no = "$fast_install" && test -n "$relink_command"; then
$opt_dry_run || {
- if test "$finalize" = yes; then
+ if $finalize; then
tmpdir=`func_mktempdir`
func_basename "$file$stripped_ext"
- file="$func_basename_result"
- outputname="$tmpdir/$file"
+ file=$func_basename_result
+ outputname=$tmpdir/$file
# Replace the output file specification.
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- $opt_silent || {
+ $opt_quiet || {
func_quote_for_expand "$relink_command"
eval "func_echo $func_quote_for_expand_result"
}
if eval "$relink_command"; then :
else
- func_error "error: relink \`$file' with the above command before installing it"
+ func_error "error: relink '$file' with the above command before installing it"
$opt_dry_run || ${RM}r "$tmpdir"
continue
fi
- file="$outputname"
+ file=$outputname
else
- func_warning "cannot relink \`$file'"
+ func_warning "cannot relink '$file'"
fi
}
else
@@ -3198,10 +4526,10 @@ func_mode_install ()
for file in $staticlibs; do
func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
# Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
@@ -3216,18 +4544,18 @@ func_mode_install ()
done
test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
+ func_warning "remember to run '$progname --finish$future_libdirs'"
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
$opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
else
exit $EXIT_SUCCESS
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"}
# a dlpreopen symbol table.
func_generate_dlsyms ()
{
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ $debug_cmd
+
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
+ my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
- my_dlsyms="${my_outputname}S.c"
+ my_dlsyms=${my_outputname}S.c
else
func_error "not configured to extract global symbols from dlpreopened files"
fi
@@ -3255,7 +4584,7 @@ func_generate_dlsyms ()
"") ;;
*.c)
# Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${my_outputname}.nm"
+ nlist=$output_objdir/$my_outputname.nm
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
@@ -3263,34 +4592,36 @@ func_generate_dlsyms ()
func_verbose "creating $output_objdir/$my_dlsyms"
$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
#ifdef __cplusplus
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
#endif
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
# define LT_DLSYM_CONST const
#endif
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* External symbol declarations for the compiler. */\
"
- if test "$dlself" = yes; then
- func_verbose "generating symbol list for \`$output'"
+ if test yes = "$dlself"; then
+ func_verbose "generating symbol list for '$output'"
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
@@ -3298,7 +4629,7 @@ extern \"C\" {
progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+ func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
$opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
@@ -3318,10 +4649,10 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
+ export_symbols=$output_objdir/$outputname.exp
$opt_dry_run || {
$RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@ extern \"C\" {
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -3345,22 +4676,22 @@ extern \"C\" {
fi
for dlprefile in $dlprefiles; do
- func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_verbose "extracting global C symbols from '$dlprefile'"
func_basename "$dlprefile"
- name="$func_basename_result"
+ name=$func_basename_result
case $host in
*cygwin* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
+ dlprefile_dlbasename=
if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
# Use subshell, to avoid clobbering current variable values
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
+ if test -n "$dlprefile_dlname"; then
func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
+ dlprefile_dlbasename=$func_basename_result
else
# no lafile. user explicitly requested -dlpreopen <import library>.
$sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@ extern \"C\" {
fi
fi
$opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
+ if test -n "$dlprefile_dlbasename"; then
eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
else
func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@ extern \"C\" {
echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
+ func_show_eval '$RM "${nlist}I"'
+ if test -n "$global_symbol_to_import"; then
+ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+ fi
+
echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
@@ -3432,11 +4768,30 @@ typedef struct {
void *address;
} lt_dlsymlist;
extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+ for (; symbol->name; ++symbol)
+ {"
+ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+ echo >> "$output_objdir/$my_dlsyms" "\
+ }
+}"
+ fi
+ echo >> "$output_objdir/$my_dlsyms" "\
LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
- { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+ {\"@INIT@\", (void *) <_syminit},"
+ fi
case $need_lib_prefix in
no)
@@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() {
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test "X$my_pic_p" != Xno; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() {
func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
# Clean up the generated files.
- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
# Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
+ symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() {
esac
;;
*)
- func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ func_fatal_error "unknown suffix for '$my_dlsyms'"
;;
esac
else
@@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() {
fi
}
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
# func_win32_libid arg
# return the library type of file 'arg'
#
@@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() {
# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
- $opt_debug
- win32_libid_type="unknown"
+ $debug_cmd
+
+ win32_libid_type=unknown
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
*ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@ func_win32_libid ()
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- $SED -n -e '
+ case $nm_interface in
+ "MS dumpbin")
+ if func_cygming_ms_implib_p "$1" ||
+ func_cygming_gnu_implib_p "$1"
+ then
+ win32_nmres=import
+ else
+ win32_nmres=
+ fi
+ ;;
+ *)
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $SED -n -e '
1,100{
/ I /{
- s,.*,import,
+ s|.*|import|
p
q
}
}'`
+ ;;
+ esac
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@ func_win32_libid ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib ()
{
- $opt_debug
+ $debug_cmd
+
sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
}
@@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib ()
# specified import library.
func_cygming_dll_for_implib_fallback_core ()
{
- $opt_debug
+ $debug_cmd
+
match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
$OBJDUMP -s --section "$1" "$2" 2>/dev/null |
$SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core ()
/./p' |
# we now have a list, one entry per line, of the stringified
# contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
+ # archive that possess that section. Heuristic: eliminate
+ # all those that have a first or second character that is
# a '.' (that is, objdump's representation of an unprintable
# character.) This should work for all archives with less than
# 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core ()
$SED -e '/^\./d;/^.\./d;q'
}
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
# func_cygming_dll_for_implib_fallback ARG
# Platform-specific function to extract the
# name of the DLL associated with the specified
@@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib_fallback ()
{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
+ $debug_cmd
+
+ if func_cygming_gnu_implib_p "$1"; then
# binutils import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
+ elif func_cygming_ms_implib_p "$1"; then
# ms-generated import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
else
# unknown
- sharedlib_from_linklib_result=""
+ sharedlib_from_linklib_result=
fi
}
@@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback ()
# func_extract_an_archive dir oldlib
func_extract_an_archive ()
{
- $opt_debug
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
+ $debug_cmd
+
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; then
lockfile=$f_ex_an_ar_oldlib.lock
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@ func_extract_an_archive ()
fi
func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
+ if test yes = "$lock_old_archive_extraction"; then
$opt_dry_run || rm -f "$lockfile"
fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@ func_extract_an_archive ()
# func_extract_archives gentop oldlib ...
func_extract_archives ()
{
- $opt_debug
- my_gentop="$1"; shift
+ $debug_cmd
+
+ my_gentop=$1; shift
my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
@@ -3765,7 +5139,7 @@ func_extract_archives ()
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
func_mkdir_p "$my_xdir"
@@ -3778,22 +5152,23 @@ func_extract_archives ()
cd $my_xdir || exit $?
darwin_archive=$my_xabs
darwin_curdir=`pwd`
- darwin_base_archive=`basename "$darwin_archive"`
+ func_basename "$darwin_archive"
+ darwin_base_archive=$func_basename_result
darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
if test -n "$darwin_arches"; then
darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
darwin_arch=
func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- func_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}"
+ for darwin_arch in $darwin_arches; do
+ func_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}"
+ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@ func_extract_archives ()
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
}
@@ -3830,7 +5205,7 @@ func_extract_archives ()
#
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
@@ -3841,7 +5216,7 @@ func_emit_wrapper ()
#! $SHELL
# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@ _LTECHO_EOF'
# Very basic option parsing. These options are (a) specific to
# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
# this pattern).
#
# There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@ func_parse_lt_options ()
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
fi
}
@@ -3944,7 +5319,7 @@ func_lt_dump_args ()
lt_dump_args_N=1;
for lt_arg
do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
done
}
@@ -3958,7 +5333,7 @@ func_exec_program_core ()
*-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@ func_exec_program_core ()
*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@ func_exec_program ()
test -n \"\$absdir\" && thisdir=\"\$absdir\"
"
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
$ECHO "\
program=lt-'$outputname'$exeext
progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@ func_exec_program ()
if test -n \"\$relink_command\"; then
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
else
- $ECHO \"\$relink_command_output\" >&2
+ \$ECHO \"\$relink_command_output\" >&2
$RM \"\$progdir/\$file\"
exit 1
fi
@@ -4101,7 +5476,7 @@ func_exec_program ()
fi
# Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
# Add our own library path to $shlibpath_var
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@ func_exec_program ()
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
@@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src ()
cat <<EOF
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@ EOF
#include <fcntl.h>
#include <sys/stat.h>
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
# ifdef __STRICT_ANSI__
int _putenv (const char *);
# endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# ifdef __STRICT_ANSI__
char *realpath (const char *, char *);
int putenv (char *);
int setenv (const char *, const char *, int);
# endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
#endif
/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# define HAVE_SETENV
# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
#endif
-#if defined(PATH_MAX)
+#if defined PATH_MAX
# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
# define LT_PATHMAX MAXPATHLEN
#else
# define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int);
# define PATH_SEPARATOR ':'
#endif
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+ defined __OS2__
# define HAVE_DOS_BASED_FILE_SYSTEM
# define FOPEN_WB "wb"
# ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int);
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
+ if (stale) { free (stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
static int lt_debug = 1;
#else
static int lt_debug = 0;
@@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f);
EOF
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
func_to_host_path "$temp_rpath"
cat <<EOF
const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@ const char * EXE_PATH_VALUE = "";
EOF
fi
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
cat <<EOF
const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
EOF
@@ -4357,12 +5735,12 @@ main (int argc, char *argv[])
char *actual_cwrapper_name;
char *target_name;
char *lt_argv_zero;
- intptr_t rval = 127;
+ int rval = 127;
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ newargz = XMALLOC (char *, (size_t) argc + 1);
/* very simple arg parsing; don't want to rely on getopt
* also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@ main (int argc, char *argv[])
newargc=0;
for (i = 1; i < argc; i++)
{
- if (strcmp (argv[i], dumpscript_opt) == 0)
+ if (STREQ (argv[i], dumpscript_opt))
{
EOF
- case "$host" in
+ case $host in
*mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@ EOF
lt_dump_script (stdout);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
+ if (STREQ (argv[i], debug_opt))
{
lt_debug = 1;
continue;
}
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ if (STREQ (argv[i], ltwrapper_option_prefix))
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@ EOF
EOF
cat <<EOF
/* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
EOF
cat <<"EOF"
lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@ EOF
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
newargz = prepare_spawn (newargz);
- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
@@ -4569,7 +5947,7 @@ base_name (const char *name)
{
const char *base;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
/* Skip over the disk name in MSDOS pathnames. */
if (isalpha ((unsigned char) name[0]) && name[1] == ':')
name += 2;
@@ -4628,7 +6006,7 @@ find_executable (const char *wrapper)
const char *p_next;
/* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
- int tmp_len;
+ size_t tmp_len;
char *concat_name;
lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@ find_executable (const char *wrapper)
return NULL;
/* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
{
concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@ find_executable (const char *wrapper)
return concat_name;
XFREE (concat_name);
}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
}
#endif
@@ -4679,7 +6057,7 @@ find_executable (const char *wrapper)
for (q = p; *q; q++)
if (IS_PATH_SEPARATOR (*q))
break;
- p_len = q - p;
+ p_len = (size_t) (q - p);
p_next = (*q == '\0' ? q : q + 1);
if (p_len == 0)
{
@@ -4798,7 +6176,7 @@ strendzap (char *str, const char *pat)
if (patlen <= len)
{
str += len - patlen;
- if (strcmp (str, pat) == 0)
+ if (STREQ (str, pat))
*str = '\0';
}
return str;
@@ -4863,7 +6241,7 @@ lt_setenv (const char *name, const char *value)
char *str = xstrdup (value);
setenv (name, str, 1);
#else
- int len = strlen (name) + 1 + strlen (value) + 1;
+ size_t len = strlen (name) + 1 + strlen (value) + 1;
char *str = XMALLOC (char, len);
sprintf (str, "%s=%s", name, value);
if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
char *new_value;
if (orig_value && *orig_value)
{
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
+ size_t orig_value_len = strlen (orig_value);
+ size_t add_len = strlen (add);
new_value = XMALLOC (char, add_len + orig_value_len + 1);
if (to_end)
{
@@ -4912,10 +6290,10 @@ lt_update_exe_path (const char *name, const char *value)
{
char *new_value = lt_extend_str (getenv (name), value, 0);
/* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ size_t len = strlen (new_value);
+ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
{
- new_value[len-1] = '\0';
+ new_value[--len] = '\0';
}
lt_setenv (name, new_value);
XFREE (new_value);
@@ -5082,27 +6460,47 @@ EOF
# True if ARG is an import lib, as indicated by $file_magic_cmd
func_win32_import_lib_p ()
{
- $opt_debug
+ $debug_cmd
+
case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
*import*) : ;;
*) false ;;
esac
}
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+ $debug_cmd
+
+ case " $compile_command " in
+ *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+ suncc_use_cstd_abi=no
+ ;;
+ *)
+ suncc_use_cstd_abi=yes
+ ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
- $opt_debug
+ $debug_cmd
+
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
# flag for every libtool invocation.
# allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@ func_mode_link ()
module=no
no_install=no
objs=
+ os2dllname=
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
- preload=no
+ preload=false
prev=
prevarg=
release=
@@ -5161,7 +6560,7 @@ func_mode_link ()
vinfo=
vinfo_number=no
weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@ func_mode_link ()
do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes != "$build_libtool_libs" \
+ && func_fatal_configuration "cannot build a shared library"
build_old_libs=no
break
;;
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
func_warning "complete static linking is impossible in this configuration"
fi
if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@ func_mode_link ()
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@ func_mode_link ()
case $prev in
bindir)
- bindir="$arg"
+ bindir=$arg
prev=
continue
;;
dlfiles|dlprefiles)
- if test "$preload" = no; then
+ $preload || {
# Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@"
- preload=yes
- fi
+ preload=:
+ }
case $arg in
*.la | *.lo) ;; # We handle these cases below.
force)
- if test "$dlself" = no; then
+ if test no = "$dlself"; then
dlself=needless
export_dynamic=yes
fi
@@ -5249,9 +6648,9 @@ func_mode_link ()
continue
;;
self)
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
dlself=yes
else
dlself=needless
@@ -5261,7 +6660,7 @@ func_mode_link ()
continue
;;
*)
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
func_append dlfiles " $arg"
else
func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@ func_mode_link ()
esac
;;
expsyms)
- export_symbols="$arg"
+ export_symbols=$arg
test -f "$arg" \
- || func_fatal_error "symbol file \`$arg' does not exist"
+ || func_fatal_error "symbol file '$arg' does not exist"
prev=
continue
;;
expsyms_regex)
- export_symbols_regex="$arg"
+ export_symbols_regex=$arg
prev=
continue
;;
@@ -5297,7 +6696,13 @@ func_mode_link ()
continue
;;
inst_prefix)
- inst_prefix_dir="$arg"
+ inst_prefix_dir=$arg
+ prev=
+ continue
+ ;;
+ mllvm)
+ # Clang does not use LLVM to link, so we can simply discard any
+ # '-mllvm $arg' options when doing the link step.
prev=
continue
;;
@@ -5321,21 +6726,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ if test none != "$pic_object"; then
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5346,7 +6751,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5354,23 +6759,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
+ arg=$pic_object
fi
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; 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_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5378,7 +6783,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
done
else
- func_fatal_error "link input file \`$arg' does not exist"
+ func_fatal_error "link input file '$arg' does not exist"
fi
arg=$save_arg
prev=
continue
;;
+ os2dllname)
+ os2dllname=$arg
+ prev=
+ continue
+ ;;
precious_regex)
- precious_files_regex="$arg"
+ precious_files_regex=$arg
prev=
continue
;;
release)
- release="-$arg"
+ release=-$arg
prev=
continue
;;
@@ -5415,7 +6825,7 @@ func_mode_link ()
func_fatal_error "only absolute run-paths are allowed"
;;
esac
- if test "$prev" = rpath; then
+ if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
*) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@ func_mode_link ()
continue
;;
shrext)
- shrext_cmds="$arg"
+ shrext_cmds=$arg
prev=
continue
;;
@@ -5470,7 +6880,7 @@ func_mode_link ()
esac
fi # test -n "$prev"
- prevarg="$arg"
+ prevarg=$arg
case $arg in
-all-static)
@@ -5484,7 +6894,7 @@ func_mode_link ()
-allow-undefined)
# FIXME: remove this flag sometime in the future.
- func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ func_fatal_error "'-allow-undefined' must not be used because it is the default"
;;
-avoid-version)
@@ -5516,7 +6926,7 @@ func_mode_link ()
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
func_fatal_error "more than one -exported-symbols argument is not allowed"
fi
- if test "X$arg" = "X-export-symbols"; then
+ if test X-export-symbols = "X$arg"; then
prev=expsyms
else
prev=expsyms_regex
@@ -5550,9 +6960,9 @@ func_mode_link ()
func_stripname "-L" '' "$arg"
if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
- func_fatal_error "require no space between \`-L' and \`$1'"
+ func_fatal_error "require no space between '-L' and '$1'"
else
- func_fatal_error "need path for \`-L' option"
+ func_fatal_error "need path for '-L' option"
fi
fi
func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@ func_mode_link ()
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
- func_fatal_error "cannot determine absolute directory name of \`$dir'"
- dir="$absdir"
+ func_fatal_error "cannot determine absolute directory name of '$dir'"
+ dir=$absdir
;;
esac
case "$deplibs " in
@@ -5599,7 +7009,7 @@ func_mode_link ()
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@ func_mode_link ()
;;
*-*-os2*)
# These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@ func_mode_link ()
;;
*-*-sco3.2v5* | *-*-sco5v6*)
# Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
# Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
esac
- elif test "X$arg" = "X-lc_r"; then
+ elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -5639,6 +7049,11 @@ func_mode_link ()
continue
;;
+ -mllvm)
+ prev=mllvm
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -5668,7 +7083,7 @@ func_mode_link ()
;;
-multi_module)
- single_module="${wl}-multi_module"
+ single_module=$wl-multi_module
continue
;;
@@ -5682,8 +7097,8 @@ func_mode_link ()
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
- func_warning "\`-no-install' is ignored for $host"
- func_warning "assuming \`-no-fast-install' instead"
+ func_warning "'-no-install' is ignored for $host"
+ func_warning "assuming '-no-fast-install' instead"
fast_install=no
;;
*) no_install=yes ;;
@@ -5701,6 +7116,11 @@ func_mode_link ()
continue
;;
+ -os2dllname)
+ prev=os2dllname
+ continue
+ ;;
+
-o) prev=output ;;
-precious-files-regex)
@@ -5788,14 +7208,14 @@ func_mode_link ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $func_quote_for_eval_result"
func_append compiler_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5804,15 +7224,15 @@ func_mode_link ()
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $wl$func_quote_for_eval_result"
func_append compiler_flags " $wl$func_quote_for_eval_result"
func_append linker_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5835,7 +7255,7 @@ func_mode_link ()
# -msg_* for osf cc
-msg_*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,46 @@ func_mode_link ()
# -m*, -t[45]*, -txscale* architecture-specific flags for GCC
# -F/path path to uninstalled frameworks, gcc on darwin
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # -fstack-protector* stack protector flags for GCC
# @file GCC response files
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
continue
;;
+ -Z*)
+ if test os2 = "`expr $host : '.*\(os2\)'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case $arg in
+ -Zlinker | -Zstack)
+ prev=xcompiler
+ ;;
+ esac
+ continue
+ else
+ # Otherwise treat like 'Some other compiler flag' below
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ fi
+ ;;
+
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -5886,21 +7327,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ test none = "$pic_object" || {
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5911,7 +7352,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5919,23 +7360,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
- fi
+ arg=$pic_object
+ }
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; 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_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5943,7 +7384,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7392,7 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
;;
@@ -5967,11 +7408,11 @@ func_mode_link ()
# A libtool-controlled library.
func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
# This library was specified with -dlopen.
func_append dlfiles " $func_resolve_sysroot_result"
prev=
- elif test "$prev" = dlprefiles; then
+ elif test dlprefiles = "$prev"; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
@@ -5986,7 +7427,7 @@ func_mode_link ()
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -5998,9 +7439,9 @@ func_mode_link ()
done # argument parsing loop
test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
+ func_fatal_help "the '$prevarg' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6009,20 +7450,23 @@ func_mode_link ()
oldlibs=
# calculate the name of the file, without its directory
func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ # Definition is injected by LT_CONFIG during libtool generation.
+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
func_to_tool_file "$output_objdir/"
tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
@@ -6045,7 +7489,7 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6053,7 +7497,7 @@ func_mode_link ()
func_append libs " $deplib"
done
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7529,7 @@ func_mode_link ()
case $file in
*.la) ;;
*)
- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
;;
esac
done
@@ -6093,7 +7537,7 @@ func_mode_link ()
prog)
compile_deplibs=
finalize_deplibs=
- alldeplibs=no
+ alldeplibs=false
newdlfiles=
newdlprefiles=
passes="conv scan dlopen dlpreopen link"
@@ -6105,29 +7549,29 @@ func_mode_link ()
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
fi
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass"; then
+ libs=$deplibs
deplibs=
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
+ dlopen) libs=$dlfiles ;;
+ dlpreopen) libs=$dlprefiles ;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
# Collect and forward deplibs of preopened libtool libs
for lib in $dlprefiles; do
# Ignore non-libtool-libs
@@ -6148,26 +7592,26 @@ func_mode_link ()
esac
done
done
- libs="$dlprefiles"
+ libs=$dlprefiles
fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
# Collect dlpreopened libraries
- save_deplibs="$deplibs"
+ save_deplibs=$deplibs
deplibs=
fi
for deplib in $libs; do
lib=
- found=no
+ found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6177,13 +7621,13 @@ func_mode_link ()
continue
;;
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- func_warning "\`-l' is ignored for archives/objects"
+ if test lib != "$linkmode" && test prog != "$linkmode"; then
+ func_warning "'-l' is ignored for archives/objects"
continue
fi
func_stripname '-l' '' "$deplib"
name=$func_stripname_result
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6191,31 +7635,22 @@ func_mode_link ()
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
+ lib=$searchdir/lib$name$search_ext
if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
+ if test .la = "$search_ext"; then
+ found=:
else
- found=no
+ found=false
fi
break 2
fi
done
done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
+ if $found; then
+ # deplib is a libtool library
# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
# We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $deplib "*)
if func_lalib_p "$lib"; then
@@ -6223,19 +7658,19 @@ func_mode_link ()
old_library=
func_source "$lib"
for l in $old_library $library_names; do
- ll="$l"
+ ll=$l
done
- if test "X$ll" = "X$old_library" ; then # only static version available
- found=no
+ if test "X$ll" = "X$old_library"; then # only static version available
+ found=false
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
fi
continue
fi
@@ -6244,15 +7679,25 @@ func_mode_link ()
*) ;;
esac
fi
+ else
+ # deplib doesn't seem to be a libtool library
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
fi
;; # -l
*.ltframework)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6265,18 +7710,18 @@ func_mode_link ()
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test conv = "$pass" && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test scan = "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6287,13 +7732,13 @@ func_mode_link ()
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
- func_warning "\`-L' is ignored for archives/objects"
+ func_warning "'-L' is ignored for archives/objects"
;;
esac # linkmode
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test link = "$pass"; then
func_stripname '-R' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
@@ -6311,7 +7756,7 @@ func_mode_link ()
lib=$func_resolve_sysroot_result
;;
*.$libext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
@@ -6322,21 +7767,26 @@ func_mode_link ()
case " $dlpreconveniencelibs " in
*" $deplib "*) ;;
*)
- valid_a_lib=no
+ valid_a_lib=false
case $deplibs_check_method in
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
+ valid_a_lib=:
fi
;;
pass_all)
- valid_a_lib=yes
+ valid_a_lib=:
;;
esac
- if test "$valid_a_lib" != yes; then
+ if $valid_a_lib; then
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ else
echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
echo "*** I have the capability to make that library automatically link in when"
@@ -6344,18 +7794,13 @@ func_mode_link ()
echo "*** shared version of the library, which you do not appear to have"
echo "*** because the file extensions .$libext of this argument makes me believe"
echo "*** that it is just a static archive that I should not use here."
- else
- echo
- $ECHO "*** Warning: Linking the shared library $output against the"
- $ECHO "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
fi
;;
esac
continue
;;
prog)
- if test "$pass" != link; then
+ if test link != "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6366,10 +7811,10 @@ func_mode_link ()
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ elif test prog = "$linkmode"; then
+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
func_append newdlprefiles " $deplib"
@@ -6382,22 +7827,20 @@ func_mode_link ()
continue
;;
%DEPLIBS%)
- alldeplibs=yes
+ alldeplibs=:
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- fi
+ $found || test -f "$lib" \
+ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$lib" \
- || func_fatal_error "\`$lib' is not a valid libtool archive"
+ || func_fatal_error "'$lib' is not a valid libtool archive"
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
dlname=
dlopen=
@@ -6427,30 +7870,30 @@ func_mode_link ()
done
fi
dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass" ||
+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then
test -n "$dlopen" && func_append dlfiles " $dlopen"
test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
if test -z "$old_library"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
+ elif test prog != "$linkmode" && test lib != "$linkmode"; then
+ func_fatal_error "'$lib' is not a convenience library"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6464,26 +7907,26 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
+ { test yes = "$prefer_static_libs" ||
+ test built,no = "$prefer_static_libs,$installed"; }; then
linklib=$old_library
else
for l in $old_library $library_names; do
- linklib="$l"
+ linklib=$l
done
fi
if test -z "$linklib"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- fi
+ if test dlopen = "$pass"; then
+ test -z "$libdir" \
+ && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
+ test yes != "$dlopen_support" ||
+ test no = "$build_libtool_libs"
+ 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
@@ -6497,40 +7940,40 @@ func_mode_link ()
# We need an absolute path.
case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
- func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "cannot determine absolute directory name of '$ladir'"
func_warning "passing it literally to the linker, although it might fail"
- abs_ladir="$ladir"
+ abs_ladir=$ladir
fi
;;
esac
func_basename "$lib"
- laname="$func_basename_result"
+ laname=$func_basename_result
# Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
+ if test yes = "$installed"; then
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
+ func_warning "library '$lib' was moved."
+ dir=$ladir
+ absdir=$abs_ladir
+ libdir=$abs_ladir
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir=$lt_sysroot$libdir
+ absdir=$lt_sysroot$libdir
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes
else
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
# Remove this search path later
func_append notinst_path " $abs_ladir"
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
+ dir=$ladir/$objdir
+ absdir=$abs_ladir/$objdir
# Remove this search path later
func_append notinst_path " $abs_ladir"
fi
@@ -6539,11 +7982,11 @@ func_mode_link ()
name=$func_stripname_result
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir" && test "$linkmode" = prog; then
- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ if test dlpreopen = "$pass"; then
+ if test -z "$libdir" && test prog = "$linkmode"; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
fi
- case "$host" in
+ case $host in
# special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
@@ -6587,9 +8030,9 @@ func_mode_link ()
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
+ elif test prog,link = "$linkmode,$pass"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
@@ -6599,14 +8042,14 @@ func_mode_link ()
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test prog = "$linkmode" && test link != "$pass"; then
func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
+ linkalldeplibs=false
+ if test no != "$link_all_deplibs" || test -z "$library_names" ||
+ test no = "$build_libtool_libs"; then
+ linkalldeplibs=:
fi
tmp_libs=
@@ -6618,14 +8061,14 @@ func_mode_link ()
;;
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if $linkalldeplibs; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6635,15 +8078,15 @@ func_mode_link ()
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ { { test no = "$prefer_static_libs" ||
+ test built,yes = "$prefer_static_libs,$installed"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
+ case $temp_rpath: in
*"$absdir:"*) ;;
*) func_append temp_rpath "$absdir:" ;;
esac
@@ -6672,9 +8115,9 @@ func_mode_link ()
esac
fi # $linkmode,$pass = prog,link...
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
+ if $alldeplibs &&
+ { test pass_all = "$deplibs_check_method" ||
+ { test yes = "$build_libtool_libs" &&
test -n "$library_names"; }; }; then
# We only need to search for static libraries
continue
@@ -6683,19 +8126,19 @@ func_mode_link ()
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
+ if test built = "$use_static_libs" && test yes = "$installed"; then
use_static_libs=no
fi
if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
- if test "$installed" = no; then
+ if test no = "$installed"; then
func_append notinst_deplibs " $lib"
need_relink=yes
fi
@@ -6705,24 +8148,24 @@ func_mode_link ()
# Warn about portability, can't link against -module's on some
# systems (darwin). Don't bleat about dlopened modules though!
- dlopenmodule=""
+ dlopenmodule=
for dlpremoduletest in $dlprefiles; do
if test "X$dlpremoduletest" = "X$lib"; then
- dlopenmodule="$dlpremoduletest"
+ dlopenmodule=$dlpremoduletest
break
fi
done
- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
echo
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; 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
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
+ if test lib = "$linkmode" &&
+ test yes = "$hardcode_into_libs"; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -6750,43 +8193,43 @@ func_mode_link ()
# figure out the soname
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
- soname="$dlname"
+ soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
esac
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
# Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
+ soroot=$soname
func_basename "$soroot"
- soname="$func_basename_result"
+ soname=$func_basename_result
func_stripname 'lib' '.dll' "$soname"
newlib=libimp-$func_stripname_result.a
# If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then :
else
- func_verbose "extracting exported symbol list from \`$soname'"
+ func_verbose "extracting exported symbol list from '$soname'"
func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
fi
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
- func_verbose "generating import library for \`$soname'"
+ func_verbose "generating import library for '$soname'"
func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
fi
# make sure the library variables are pointing to the new library
@@ -6794,58 +8237,58 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test prog = "$linkmode" || test relink != "$opt_mode"; then
add_shlibpath=
add_dir=
add=
lib_linked=yes
case $hardcode_action in
immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
+ if test no = "$hardcode_direct"; then
+ add=$dir/$linklib
case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) 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" ;;
+ *-*-unixware7*) add_dir=-L$dir ;;
*-*-darwin* )
- # if the lib is a (non-dlopened) module then we can not
+ # if the lib is a (non-dlopened) module then we cannot
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP ": [^:]* bundle" >/dev/null ; then
+ $GREP ": [^:]* bundle" >/dev/null; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
+ if test -z "$old_library"; then
echo
echo "*** And there doesn't seem to be a static archive available"
echo "*** The link will probably fail, sorry"
else
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
elif test -n "$old_library"; then
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
fi
esac
- elif test "$hardcode_minus_L" = no; then
+ elif test no = "$hardcode_minus_L"; then
case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
+ *-*-sunos*) add_shlibpath=$dir ;;
esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
+ add_dir=-L$dir
+ add=-l$name
+ elif test no = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
;;
relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$absdir"
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$dir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$absdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6854,10 +8297,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
@@ -6865,7 +8308,7 @@ func_mode_link ()
*) lib_linked=no ;;
esac
- if test "$lib_linked" != yes; then
+ if test yes != "$lib_linked"; then
func_fatal_configuration "unsupported hardcode properties"
fi
@@ -6875,15 +8318,15 @@ func_mode_link ()
*) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes &&
- test "$hardcode_minus_L" != yes &&
- test "$hardcode_shlibpath_var" = yes; then
+ if test yes != "$hardcode_direct" &&
+ test yes != "$hardcode_minus_L" &&
+ test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6892,33 +8335,33 @@ func_mode_link ()
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test prog = "$linkmode" || test relink = "$opt_mode"; then
add_shlibpath=
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$libdir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$libdir
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
+ add=-l$name
+ elif test yes = "$hardcode_automatic"; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add=$inst_prefix_dir$libdir/$linklib
else
- add="$libdir/$linklib"
+ add=$libdir/$linklib
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ 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
@@ -6927,10 +8370,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
+ add=-l$name
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -6938,43 +8381,43 @@ func_mode_link ()
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test prog = "$linkmode"; then
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
+ if test unsupported != "$hardcode_direct"; then
+ test -n "$old_library" && linklib=$old_library
compile_deplibs="$dir/$linklib $compile_deplibs"
finalize_deplibs="$dir/$linklib $finalize_deplibs"
else
compile_deplibs="-l$name -L$dir $compile_deplibs"
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
fi
- elif test "$build_libtool_libs" = yes; then
+ elif test yes = "$build_libtool_libs"; then
# Not a shared library
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all != "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
echo
- $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** Warning: This system cannot link to static lib archive $lib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have."
- if test "$module" = yes; then
+ if test yes = "$module"; then
echo "*** But as you try to build a module library, libtool will still create "
echo "*** a static module, that should work as long as the dlopening application"
echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
+ if test no = "$build_old_libs"; then
build_libtool_libs=module
build_old_libs=yes
else
@@ -6987,11 +8430,11 @@ func_mode_link ()
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test yes != "$hardcode_into_libs" ||
+ test yes = "$build_old_libs" ||
+ test yes = "$link_static"; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -7005,12 +8448,12 @@ func_mode_link ()
*) func_append temp_deplibs " $libdir";;
esac
done
- dependency_libs="$temp_deplibs"
+ dependency_libs=$temp_deplibs
fi
func_append newlib_search_path " $absdir"
# Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
@@ -7020,7 +8463,7 @@ func_mode_link ()
func_resolve_sysroot "$func_stripname_result";;
*) func_resolve_sysroot "$deplib" ;;
esac
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $func_resolve_sysroot_result "*)
func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7029,12 +8472,12 @@ func_mode_link ()
func_append tmp_libs " $func_resolve_sysroot_result"
done
- if test "$link_all_deplibs" != no; then
+ if test no != "$link_all_deplibs"; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
path=
case $deplib in
- -L*) path="$deplib" ;;
+ -L*) path=$deplib ;;
*.la)
func_resolve_sysroot "$deplib"
deplib=$func_resolve_sysroot_result
@@ -7042,12 +8485,12 @@ func_mode_link ()
dir=$func_dirname_result
# We need an absolute path.
case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
- func_warning "cannot determine absolute directory name of \`$dir'"
- absdir="$dir"
+ func_warning "cannot determine absolute directory name of '$dir'"
+ absdir=$dir
fi
;;
esac
@@ -7055,35 +8498,35 @@ func_mode_link ()
case $host in
*-*-darwin*)
depdepl=
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
+ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names"; then
+ for tmp in $deplibrary_names; do
depdepl=$tmp
done
- if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -f "$absdir/$objdir/$depdepl"; then
+ depdepl=$absdir/$objdir/$depdepl
+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
path=
fi
fi
;;
*)
- path="-L$absdir/$objdir"
+ path=-L$absdir/$objdir
;;
esac
else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
test "$absdir" != "$libdir" && \
- func_warning "\`$deplib' seems to be moved"
+ func_warning "'$deplib' seems to be moved"
- path="-L$absdir"
+ path=-L$absdir
fi
;;
esac
@@ -7095,23 +8538,23 @@ func_mode_link ()
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = link; then
- if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+ if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+ test conv = "$pass" || {
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -7121,12 +8564,12 @@ func_mode_link ()
esac
done
newlib_search_path=
- fi
+ }
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
+ if test prog,link = "$linkmode,$pass"; then
vars="compile_deplibs finalize_deplibs"
+ else
+ vars=deplibs
fi
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
@@ -7184,62 +8627,93 @@ func_mode_link ()
eval $var=\"$tmp_libs\"
done # for var
fi
+
+ # Add Sun CC postdeps if required:
+ test CXX = "$tagname" && {
+ case $host_os in
+ linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C++ 5.9
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ func_cc_basename "$CC"
+ case $func_cc_basename_result in
+ CC* | sunCC*)
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ }
+
# Last step: remove runtime libs from dependency_libs
# (they stay in deplibs)
tmp_libs=
- for i in $dependency_libs ; do
+ for i in $dependency_libs; do
case " $predeps $postdeps $compiler_lib_search_path " in
*" $i "*)
- i=""
+ i=
;;
esac
- if test -n "$i" ; then
+ if test -n "$i"; then
func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
fi
case $linkmode in
oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for archives"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for archives"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ func_warning "'-l' and '-L' are ignored for archives" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for archives"
+ func_warning "'-rpath' is ignored for archives"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for archives"
+ func_warning "'-R' is ignored for archives"
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for archives"
+ func_warning "'-version-info/-version-number' is ignored for archives"
test -n "$release" && \
- func_warning "\`-release' is ignored for archives"
+ func_warning "'-release' is ignored for archives"
test -n "$export_symbols$export_symbols_regex" && \
- func_warning "\`-export-symbols' is ignored for archives"
+ func_warning "'-export-symbols' is ignored for archives"
# Now set the variables for building old libraries.
build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
func_append objs "$old_deplibs"
;;
lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
+ # Make sure we only generate libraries of the form 'libNAME.la'.
case $outputname in
lib*)
func_stripname 'lib' '.la' "$outputname"
@@ -7248,10 +8722,10 @@ func_mode_link ()
eval libname=\"$libname_spec\"
;;
*)
- test "$module" = no && \
- func_fatal_help "libtool library \`$output' must begin with \`lib'"
+ test no = "$module" \
+ && func_fatal_help "libtool library '$output' must begin with 'lib'"
- if test "$need_lib_prefix" != no; then
+ if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
func_stripname '' '.la' "$outputname"
name=$func_stripname_result
@@ -7265,8 +8739,8 @@ func_mode_link ()
esac
if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ if test pass_all != "$deplibs_check_method"; then
+ func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
else
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7275,21 +8749,21 @@ func_mode_link ()
fi
fi
- test "$dlself" != no && \
- func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+ || func_warning "'-dlopen self' is ignored for libtool libraries"
set dummy $rpath
shift
- test "$#" -gt 1 && \
- func_warning "ignoring multiple \`-rpath's for a libtool library"
+ test 1 -lt "$#" \
+ && func_warning "ignoring multiple '-rpath's for a libtool library"
- install_libdir="$1"
+ install_libdir=$1
oldlibs=
if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
+ # Some compilers have problems with a '.al' extension so
# convenience libraries should have the same extension an
# archive normally would.
oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7298,20 +8772,20 @@ func_mode_link ()
fi
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+ func_warning "'-version-info/-version-number' is ignored for convenience libraries"
test -n "$release" && \
- func_warning "\`-release' is ignored for convenience libraries"
+ func_warning "'-release' is ignored for convenience libraries"
else
# Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
+ save_ifs=$IFS; IFS=:
set dummy $vinfo 0 0 0
shift
- IFS="$save_ifs"
+ IFS=$save_ifs
test -n "$7" && \
- func_fatal_help "too many parameters to \`-version-info'"
+ func_fatal_help "too many parameters to '-version-info'"
# convert absolute version numbers to libtool ages
# this retains compatibility with .la files and attempts
@@ -7319,42 +8793,42 @@ func_mode_link ()
case $vinfo_number in
yes)
- number_major="$1"
- number_minor="$2"
- number_revision="$3"
+ number_major=$1
+ number_minor=$2
+ number_revision=$3
#
# There are really only two kinds -- those that
# use the current revision as the major version
# and those that subtract age and use age as
# a minor version. But, then there is irix
- # which has an extra 1 added just for fun
+ # that has an extra 1 added just for fun
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|linux|osf|windows|none)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
+ age=$number_minor
+ revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ freebsd-aout|qnx|sunos)
+ current=$number_major
+ revision=$number_minor
+ age=0
;;
irix|nonstopux)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_minor"
+ age=$number_minor
+ revision=$number_minor
lt_irix_increment=no
;;
esac
;;
no)
- current="$1"
- revision="$2"
- age="$3"
+ current=$1
+ revision=$2
+ age=$3
;;
esac
@@ -7362,30 +8836,30 @@ func_mode_link ()
case $current in
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]) ;;
*)
- func_error "CURRENT \`$current' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "CURRENT '$current' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $revision in
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]) ;;
*)
- func_error "REVISION \`$revision' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "REVISION '$revision' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $age in
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]) ;;
*)
- func_error "AGE \`$age' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
if test "$age" -gt "$current"; then
- func_error "AGE \`$age' is greater than the current interface number \`$current'"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' is greater than the current interface number '$current'"
+ func_fatal_error "'$vinfo' is not valid version information"
fi
# Calculate the version variables.
@@ -7400,26 +8874,36 @@ func_mode_link ()
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
# Darwin ld doesn't like 0 for these options...
func_arith $current + 1
minor_current=$func_arith_result
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ # On Darwin other compilers
+ case $CC in
+ nagfor*)
+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+ ;;
+ *)
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ esac
;;
freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
+ major=.$current
+ versuffix=.$current.$revision
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
+ if test no = "$lt_irix_increment"; then
func_arith $current - $age
else
func_arith $current - $age + 1
@@ -7430,69 +8914,74 @@ func_mode_link ()
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
- verstring="$verstring_prefix$major.$revision"
+ verstring=$verstring_prefix$major.$revision
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $revision - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring_prefix$major.$iface:$verstring"
+ verstring=$verstring_prefix$major.$iface:$verstring
done
- # Before this point, $major must not contain `.'.
+ # Before this point, $major must not contain '.'.
major=.$major
- versuffix="$major.$revision"
+ versuffix=$major.$revision
;;
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
;;
osf)
func_arith $current - $age
major=.$func_arith_result
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+ versuffix=.$current.$age.$revision
+ verstring=$current.$age.$revision
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $current - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring:${iface}.0"
+ verstring=$verstring:$iface.0
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ func_append verstring ":$current.0"
;;
qnx)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
+ ;;
+
+ sco)
+ major=.$current
+ versuffix=.$current
;;
sunos)
- major=".$current"
- versuffix=".$current.$revision"
+ major=.$current
+ versuffix=.$current.$revision
;;
windows)
# Use '-' rather than '.', since we only want one
- # extension on DOS 8.3 filesystems.
+ # extension on DOS 8.3 file systems.
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
*)
- func_fatal_configuration "unknown library version type \`$version_type'"
+ func_fatal_configuration "unknown library version type '$version_type'"
;;
esac
@@ -7506,42 +8995,45 @@ func_mode_link ()
verstring=
;;
*)
- verstring="0.0"
+ verstring=0.0
;;
esac
- if test "$need_version" = no; then
+ if test no = "$need_version"; then
versuffix=
else
- versuffix=".0.0"
+ versuffix=.0.0
fi
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test yes,no = "$avoid_version,$need_version"; then
major=
versuffix=
- verstring=""
+ verstring=
fi
# Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- func_warning "undefined symbols not allowed in $host shared libraries"
- build_libtool_libs=no
- build_old_libs=yes
+ if test yes = "$allow_undefined"; then
+ if test unsupported = "$allow_undefined_flag"; then
+ if test yes = "$build_old_libs"; then
+ func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+ build_libtool_libs=no
+ else
+ func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+ fi
fi
else
# Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
+ allow_undefined_flag=$no_undefined_flag
fi
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7550,8 +9042,8 @@ func_mode_link ()
case $p in
*.$objext | *.gcno)
;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+ if test -n "$precious_files_regex"; then
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
then
continue
@@ -7567,11 +9059,11 @@ func_mode_link ()
fi
# Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
@@ -7592,13 +9084,13 @@ func_mode_link ()
*) func_append finalize_rpath " $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
# Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
dlfiles=
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
@@ -7608,7 +9100,7 @@ func_mode_link ()
done
# Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
dlprefiles=
for lib in $old_dlprefiles; do
case "$dlprefiles " in
@@ -7617,7 +9109,7 @@ func_mode_link ()
esac
done
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7641,7 +9133,7 @@ func_mode_link ()
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test yes = "$build_libtool_need_lc"; then
func_append deplibs " -lc"
fi
;;
@@ -7657,9 +9149,9 @@ func_mode_link ()
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
+ release=
+ versuffix=
+ major=
newdeplibs=
droppeddeps=no
case $deplibs_check_method in
@@ -7688,20 +9180,20 @@ EOF
-l*)
func_stripname -l '' "$i"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7731,20 +9223,20 @@ EOF
$opt_dry_run || $RM conftest
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7781,24 +9273,24 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
if test -n "$file_magic_glob"; then
libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
else
libnameglob=$libname
fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
+ if test yes = "$want_nocaseglob"; then
shopt -s nocaseglob
potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
$nocaseglob
@@ -7816,25 +9308,25 @@ EOF
# We might still enter an endless loop, since a link
# loop can be closed while we follow links,
# but so what?
- potlib="$potent_lib"
+ potlib=$potent_lib
while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+ *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7842,7 +9334,7 @@ EOF
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7865,30 +9357,30 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
+ potlib=$potent_lib # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7896,7 +9388,7 @@ EOF
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7912,18 +9404,18 @@ EOF
done # Gone through all deplibs.
;;
none | unknown | *)
- newdeplibs=""
+ newdeplibs=
tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- for i in $predeps $postdeps ; do
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+ for i in $predeps $postdeps; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
done
fi
case $tmp_deplibs in
*[!\ \ ]*)
echo
- if test "X$deplibs_check_method" = "Xnone"; then
+ if test none = "$deplibs_check_method"; then
echo "*** Warning: inter-library dependencies are not supported in this platform."
else
echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7947,8 +9439,8 @@ EOF
;;
esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
+ if test yes = "$droppeddeps"; then
+ if test yes = "$module"; then
echo
echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
@@ -7957,12 +9449,12 @@ EOF
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7973,14 +9465,14 @@ EOF
echo "*** automatically added whenever a program is linked with this library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test no = "$allow_undefined"; then
echo
echo "*** Since this library must not contain undefined symbols,"
echo "*** because either the platform does not support them or"
echo "*** it was explicitly requested with -no-undefined,"
echo "*** libtool will only create a static version of it."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -8026,7 +9518,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- deplibs="$new_libs"
+ deplibs=$new_libs
# All the library-specific variables (install_libdir is set above).
library_names=
@@ -8034,25 +9526,25 @@ EOF
dlname=
# Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
- # Remove ${wl} instances when linking with ld.
+ if test yes = "$build_libtool_libs"; then
+ # Remove $wl instances when linking with ld.
# FIXME: should test the right _cmds variable.
case $archive_cmds in
*\$LD\ *) wl= ;;
esac
- if test "$hardcode_into_libs" = yes; then
+ if test yes = "$hardcode_into_libs"; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
- rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ rpath=$finalize_rpath
+ test relink = "$opt_mode" || rpath=$compile_rpath$rpath
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
func_replace_sysroot "$libdir"
libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8077,7 +9569,7 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8091,8 +9583,8 @@ EOF
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
fi
- shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ shlibpath=$finalize_shlibpath
+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,19 +9594,19 @@ EOF
eval library_names=\"$library_names_spec\"
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
if test -z "$dlname"; then
dlname=$soname
fi
- lib="$output_objdir/$realname"
+ lib=$output_objdir/$realname
linknames=
for link
do
@@ -8128,7 +9620,7 @@ EOF
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- export_symbols="$output_objdir/$libname.uexp"
+ export_symbols=$output_objdir/$libname.uexp
func_append delfiles " $export_symbols"
fi
@@ -8137,31 +9629,31 @@ EOF
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ func_dll_def_p "$export_symbols" || {
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
# export_symbols gets reassigned inside the "prepare
# the list of exported symbols" if statement, so the
# include_expsyms logic still works.
- orig_export_symbols="$export_symbols"
+ orig_export_symbols=$export_symbols
export_symbols=
always_export_symbols=yes
- fi
+ }
fi
;;
esac
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd1 in $cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
# Take the normal branch if the nm_file_list_spec branch
# doesn't work or if tool conversion is not needed.
case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8175,7 +9667,7 @@ EOF
try_normal_branch=no
;;
esac
- if test "$try_normal_branch" = yes \
+ if test yes = "$try_normal_branch" \
&& { test "$len" -lt "$max_cmd_len" \
|| test "$max_cmd_len" -le -1; }
then
@@ -8186,7 +9678,7 @@ EOF
output_la=$func_basename_result
save_libobjs=$libobjs
save_output=$output
- output=${output_objdir}/${output_la}.nm
+ output=$output_objdir/$output_la.nm
func_to_tool_file "$output"
libobjs=$nm_file_list_spec$func_to_tool_file_result
func_append delfiles " $output"
@@ -8209,8 +9701,8 @@ EOF
break
fi
done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ IFS=$save_ifs
+ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
@@ -8218,16 +9710,16 @@ EOF
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8246,11 +9738,11 @@ EOF
;;
esac
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec" &&
- test "$compiler_needs_object" = yes &&
+ test yes = "$compiler_needs_object" &&
test -z "$libobjs"; then
# extract the archives, so we have objects to list.
# TODO: could optimize this to just extract one archive.
@@ -8261,7 +9753,7 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
test "X$libobjs" = "X " && libobjs=
else
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8270,18 +9762,18 @@ EOF
fi
fi
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
eval test_cmds=\"$module_expsym_cmds\"
cmds=$module_expsym_cmds
@@ -8299,7 +9791,7 @@ EOF
fi
fi
- if test "X$skipped_export" != "X:" &&
+ if test : != "$skipped_export" &&
func_len " $test_cmds" &&
len=$func_len_result &&
test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8332,8 +9824,8 @@ EOF
last_robj=
k=1
- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- output=${output_objdir}/${output_la}.lnkscript
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+ output=$output_objdir/$output_la.lnkscript
func_verbose "creating GNU ld script: $output"
echo 'INPUT (' > $output
for obj in $save_libobjs
@@ -8345,14 +9837,14 @@ EOF
func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+ output=$output_objdir/$output_la.lnk
func_verbose "creating linker input file list: $output"
: > $output
set x $save_libobjs
shift
firstobj=
- if test "$compiler_needs_object" = yes; then
+ if test yes = "$compiler_needs_object"; then
firstobj="$1 "
shift
fi
@@ -8367,7 +9859,7 @@ EOF
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
eval test_cmds=\"$reload_cmds\"
func_len " $test_cmds"
len0=$func_len_result
@@ -8379,13 +9871,13 @@ EOF
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- if test "X$objlist" = X ||
+ if test -z "$objlist" ||
test "$len" -lt "$max_cmd_len"; then
func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
- if test "$k" -eq 1 ; then
+ if test 1 -eq "$k"; then
# The first file doesn't have a previous command to add.
reload_objs=$objlist
eval concat_cmds=\"$reload_cmds\"
@@ -8395,10 +9887,10 @@ EOF
reload_objs="$objlist $last_robj"
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
- last_robj=$output_objdir/$output_la-${k}.$objext
+ last_robj=$output_objdir/$output_la-$k.$objext
func_arith $k + 1
k=$func_arith_result
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
@@ -8410,9 +9902,9 @@ EOF
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\$concat_cmds$reload_cmds\"
if test -n "$last_robj"; then
- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
func_append delfiles " $output"
@@ -8420,9 +9912,9 @@ EOF
output=
fi
- if ${skipped_export-false}; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ ${skipped_export-false} && {
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
libobjs=$output
# Append the command to create the export file.
@@ -8431,16 +9923,16 @@ EOF
if test -n "$last_robj"; then
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- fi
+ }
test -n "$save_libobjs" &&
func_verbose "creating a temporary reloadable object file: $output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8448,7 +9940,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8457,7 +9949,7 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
if test -n "$export_symbols_regex" && ${skipped_export-false}; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8465,18 +9957,18 @@ EOF
fi
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8485,7 +9977,7 @@ EOF
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
- fi
+ }
libobjs=$output
# Restore the value of output.
@@ -8499,7 +9991,7 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
cmds=$module_expsym_cmds
else
@@ -8521,7 +10013,7 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -8529,11 +10021,12 @@ EOF
test "X$libobjs" = "X " && libobjs=
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
- IFS="$save_ifs"
+ IFS=$sp$nl
eval cmd=\"$cmd\"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8541,7 +10034,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8550,10 +10043,10 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8573,39 +10066,39 @@ EOF
done
# If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
+ if test yes = "$module" || test yes = "$export_dynamic"; then
# On all known operating systems, these are identical.
- dlname="$soname"
+ dlname=$soname
fi
fi
;;
obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for objects"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for objects"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ func_warning "'-l' and '-L' are ignored for objects" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for objects"
+ func_warning "'-rpath' is ignored for objects"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for objects"
+ func_warning "'-R' is ignored for objects"
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for objects"
+ func_warning "'-version-info' is ignored for objects"
test -n "$release" && \
- func_warning "\`-release' is ignored for objects"
+ func_warning "'-release' is ignored for objects"
case $output in
*.lo)
test -n "$objs$old_deplibs" && \
- func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+ func_fatal_error "cannot build library object '$output' from non-libtool objects"
libobj=$output
func_lo2o "$libobj"
@@ -8613,7 +10106,7 @@ EOF
;;
*)
libobj=
- obj="$output"
+ obj=$output
;;
esac
@@ -8626,17 +10119,19 @@ EOF
# the extraction.
reload_conv_objs=
gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
+ # if reload_cmds runs $LD directly, get rid of -Wl from
+ # whole_archive_flag_spec and hope we can get by with turning comma
+ # into space.
+ case $reload_cmds in
+ *\$LD[\ \$]*) wl= ;;
+ esac
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
else
- gentop="$output_objdir/${obj}x"
+ gentop=$output_objdir/${obj}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8645,12 +10140,12 @@ EOF
fi
# If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
- output="$obj"
+ output=$obj
func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
@@ -8662,7 +10157,7 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
if test -n "$gentop"; then
func_show_eval '${RM}r "$gentop"'
fi
@@ -8672,12 +10167,12 @@ EOF
# $show "echo timestamp > $libobj"
# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
- fi
+ }
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
+ output=$libobj
func_execute_cmds "$reload_cmds" 'exit $?'
fi
@@ -8694,16 +10189,14 @@ EOF
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for programs"
+ func_warning "'-version-info' is ignored for programs"
test -n "$release" && \
- func_warning "\`-release' is ignored for programs"
+ func_warning "'-release' is ignored for programs"
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
- && test "$dlopen_self" = unknown \
- && test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+ $preload \
+ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8717,11 +10210,11 @@ EOF
*-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
# But is supposedly fixed on 10.4 or later (yay!).
- if test "$tagname" = CXX ; then
+ if test CXX = "$tagname"; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ func_append compile_command " $wl-bind_at_load"
+ func_append finalize_command " $wl-bind_at_load"
;;
esac
fi
@@ -8757,7 +10250,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs"
@@ -8781,7 +10274,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8804,7 +10297,7 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -8821,10 +10314,10 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
rpath=
hardcode_libdirs=
@@ -8832,7 +10325,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8857,45 +10350,43 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; then
# Transform all the library objects into standard objects.
compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then
func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- wrappers_required=yes
+ wrappers_required=:
case $host in
*cegcc* | *mingw32ce*)
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
+ wrappers_required=false
;;
*cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
fi
;;
esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
# Replace the output file specification.
compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
+ link_command=$compile_command$compile_rpath
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
@@ -8908,12 +10399,12 @@ EOF
fi
# Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ if test -f "$output_objdir/${outputname}S.$objext"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
fi
exit $exit_status
- fi
+ }
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8943,9 +10434,9 @@ EOF
fi
fi
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
# We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
+ link_command=$compile_var$compile_command$compile_rpath
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
@@ -8962,27 +10453,28 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ case $hardcode_action,$fast_install in
+ relink,*)
+ # Fast installation is not supported
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
- func_warning "this platform does not like uninstalled shared libraries"
- func_warning "\`$output' will be relinked during installation"
- else
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- else
- # fast_install is set to needless
- relink_command=
- fi
- else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
- fi
- fi
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "'$output' will be relinked during installation"
+ ;;
+ *,yes)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ ;;
+ *,no)
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+ *,needless)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=
+ ;;
+ esac
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9039,8 +10531,8 @@ EOF
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
+ 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
@@ -9061,7 +10553,7 @@ EOF
trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
$opt_dry_run || {
# note: this script will not be executed, so do not chmod.
- if test "x$build" = "x$host" ; then
+ if test "x$build" = "x$host"; then
$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
else
func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9084,25 +10576,27 @@ EOF
# See if we need to build an old-fashioned archive.
for oldlib in $oldlibs; do
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save $symfileobj"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs=$convenience
build_libtool_libs=no
- else
+ ;;
+ module)
+ oldobjs=$libobjs_save
+ addlibs=$old_convenience
+ build_libtool_libs=no
+ ;;
+ *)
oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- fi
+ $preload && test -f "$symfileobj" \
+ && func_append oldobjs " $symfileobj"
+ addlibs=$old_convenience
+ ;;
+ esac
if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $addlibs
@@ -9110,13 +10604,13 @@ EOF
fi
# Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
cmds=$old_archive_from_new_cmds
else
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -9137,7 +10631,7 @@ EOF
:
else
echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
@@ -9146,7 +10640,7 @@ EOF
for obj in $save_oldobjs
do
func_basename "$obj"
- objbase="$func_basename_result"
+ objbase=$func_basename_result
case " $oldobjs " in
" ") oldobjs=$obj ;;
*[\ /]"$objbase "*)
@@ -9215,18 +10709,18 @@ EOF
else
# the above command should be used before it gets too long
oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
+ if test "$obj" = "$last_oldobj"; then
RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
objlist=
len=$len0
fi
done
RANLIB=$save_RANLIB
oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
+ if test -z "$oldobjs"; then
eval cmds=\"\$concat_cmds\"
else
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9243,7 +10737,7 @@ EOF
case $output in
*.la)
old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
@@ -9258,31 +10752,31 @@ EOF
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --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 "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
relink_command=
fi
# Only create the output if not a dry run.
$opt_dry_run || {
for installed in no yes; do
- if test "$installed" = yes; then
+ if test yes = "$installed"; then
if test -z "$install_libdir"; then
break
fi
- output="$output_objdir/$outputname"i
+ output=$output_objdir/${outputname}i
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
case $deplib in
*.la)
func_basename "$deplib"
- name="$func_basename_result"
+ name=$func_basename_result
func_resolve_sysroot "$deplib"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
;;
-L*)
@@ -9298,23 +10792,23 @@ EOF
*) func_append newdependency_libs " $deplib" ;;
esac
done
- dependency_libs="$newdependency_libs"
+ dependency_libs=$newdependency_libs
newdlfiles=
for lib in $dlfiles; do
case $lib in
*.la)
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
*) func_append newdlfiles " $lib" ;;
esac
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
@@ -9324,34 +10818,34 @@ EOF
# didn't already link the preopened objects directly into
# the library:
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlfiles " $abs"
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlprefiles " $abs"
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
fi
$RM $output
# place dlname in correct position for cygwin
@@ -9367,10 +10861,9 @@ EOF
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
+ if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
+ tdlname=$func_relative_path_result/$dlname
else
# Otherwise fall back on heuristic.
tdlname=../bin/$dlname
@@ -9379,7 +10872,7 @@ EOF
esac
$ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -9393,7 +10886,7 @@ library_names='$library_names'
# The name of the static archive.
old_library='$old_library'
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
inherited_linker_flags='$new_inherited_linker_flags'
# Libraries that this one depends upon.
@@ -9419,7 +10912,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test no,yes = "$installed,$need_relink"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
@@ -9434,27 +10927,29 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
# func_mode_uninstall arg...
func_mode_uninstall ()
{
- $opt_debug
- RM="$nonopt"
+ $debug_cmd
+
+ RM=$nonopt
files=
- rmforce=
+ rmforce=false
exit_status=0
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
-*) func_append RM " $arg" ;;
*) func_append files " $arg" ;;
esac
@@ -9467,18 +10962,18 @@ func_mode_uninstall ()
for file in $files; do
func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+ odir=$objdir
else
- odir="$dir/$objdir"
+ odir=$dir/$objdir
fi
func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
# Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
case " $rmdirs " in
*" $odir "*) ;;
*) func_append rmdirs " $odir" ;;
@@ -9493,11 +10988,11 @@ func_mode_uninstall ()
elif test -d "$file"; then
exit_status=1
continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
continue
fi
- rmfiles="$file"
+ rmfiles=$file
case $name in
*.la)
@@ -9511,7 +11006,7 @@ func_mode_uninstall ()
done
test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$opt_mode" in
+ case $opt_mode in
clean)
case " $library_names " in
*" $dlname "*) ;;
@@ -9522,12 +11017,12 @@ func_mode_uninstall ()
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -9543,21 +11038,19 @@ func_mode_uninstall ()
func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
+ if test -n "$pic_object" && test none != "$pic_object"; then
func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" &&
- test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then
func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test clean = "$opt_mode"; then
noexename=$name
case $file in
*.exe)
@@ -9584,12 +11077,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+ if test yes = "$fast_install" && test -n "$relink_command"; then
func_append rmfiles " $odir/lt-$name"
fi
- if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ if test "X$noexename" != "X$name"; then
+ func_append rmfiles " $odir/lt-$noexename.c"
fi
fi
fi
@@ -9598,7 +11091,7 @@ func_mode_uninstall ()
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9608,16 +11101,17 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
test -z "$opt_mode" && {
- help="$generic_help"
+ help=$generic_help
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
@@ -9628,7 +11122,7 @@ exit $exit_status
# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
@@ -9651,5 +11145,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# mode:shell-script
# sh-indentation:2
# End:
-# vi:sw=2
-
diff --git a/config.h.in b/config.h.in
index 0357cc0..5fb05ff 100644
--- a/config.h.in
+++ b/config.h.in
@@ -30,6 +30,18 @@
/* Package name for gettext */
#undef GETTEXT_PACKAGE
+/* Define to 1 if you have the declaration of `ID3Field_GetEncoding', and to 0
+ if you don't. */
+#undef HAVE_DECL_ID3FIELD_GETENCODING
+
+/* Define to 1 if you have the declaration of `ID3Field_IsEncodable', and to 0
+ if you don't. */
+#undef HAVE_DECL_ID3FIELD_ISENCODABLE
+
+/* Define to 1 if you have the declaration of `ID3Field_SetEncoding', and to 0
+ if you don't. */
+#undef HAVE_DECL_ID3FIELD_SETENCODING
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -78,8 +90,7 @@
/* id3lib patch level */
#undef ID3LIB_PATCH
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
diff --git a/configure b/configure
index d81d40b..d5ab549 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for EasyTAG 2.3.4.
+# Generated by GNU Autoconf 2.69 for EasyTAG 2.3.5.
#
# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=easytag>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='EasyTAG'
PACKAGE_TARNAME='easytag'
-PACKAGE_VERSION='2.3.4'
-PACKAGE_STRING='EasyTAG 2.3.4'
+PACKAGE_VERSION='2.3.5'
+PACKAGE_STRING='EasyTAG 2.3.5'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=easytag'
PACKAGE_URL='https://wiki.gnome.org/Apps/EasyTAG'
@@ -647,6 +647,8 @@ WARN_CXXFLAGS
WARN_CFLAGS
EASYTAG_LIBS
EASYTAG_CFLAGS
+GTK_DEPRECATION_FLAGS
+GLIB_DEPRECATION_FLAGS
ENABLE_NAUTILUS_ACTIONS_FALSE
ENABLE_NAUTILUS_ACTIONS_TRUE
NAUTILUS_EXTENSION_DIR
@@ -728,6 +730,7 @@ INTLTOOL_MERGE
INTLTOOL_UPDATE
USE_NLS
CPP
+LT_SYS_LIBRARY_PATH
OTOOL64
OTOOL
LIPO
@@ -851,6 +854,7 @@ enable_static
enable_shared
with_pic
enable_fast_install
+with_aix_soname
enable_dependency_tracking
with_gnu_ld
with_sysroot
@@ -871,6 +875,7 @@ enable_mp4
enable_wavpack
enable_nautilus_actions
enable_compile_warnings
+enable_Werror
enable_schemas_compile
'
ac_precious_vars='build_alias
@@ -881,6 +886,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
+LT_SYS_LIBRARY_PATH
CPP
CXX
CXXFLAGS
@@ -1435,7 +1441,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures EasyTAG 2.3.4 to adapt to many kinds of systems.
+\`configure' configures EasyTAG 2.3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1505,7 +1511,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of EasyTAG 2.3.4:";;
+ short | recursive ) echo "Configuration of EasyTAG 2.3.5:";;
esac
cat <<\_ACEOF
@@ -1547,6 +1553,7 @@ Optional Features:
(default=auto)
--enable-compile-warnings=[no/minimum/yes/maximum/error]
Enable different levels of compiler warnings
+ --disable-Werror Unconditionally make all compiler warnings non-fatal
--disable-schemas-compile
Disable regeneration of gschemas.compiled on install
@@ -1555,9 +1562,12 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot=DIR Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).
+ --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ compiler's sysroot if not specified).
--with-xml-catalog=CATALOG
path to xml catalog to use
--with-help-dir=DIR path where help files are installed
@@ -1570,6 +1580,8 @@ Some influential environment variables:
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
+ LT_SYS_LIBRARY_PATH
+ User-defined run-time library search path.
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
@@ -1657,7 +1669,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-EasyTAG configure 2.3.4
+EasyTAG configure 2.3.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2052,11 +2064,57 @@ fi
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
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 EasyTAG $as_me 2.3.4, which was
+It was created by EasyTAG $as_me 2.3.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2925,7 +2983,7 @@ fi
# Define the identity of the package.
PACKAGE='easytag'
- VERSION='2.3.4'
+ VERSION='2.3.5'
# Some tools Automake needs.
@@ -3081,8 +3139,8 @@ esac
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -3096,7 +3154,7 @@ macro_revision='1.3337'
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -3216,7 +3274,7 @@ func_echo_all ()
$ECHO ""
}
-case "$ECHO" in
+case $ECHO in
printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
$as_echo "printf" >&6; } ;;
print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -4578,19 +4636,19 @@ test -z "$GREP" && GREP=grep
# 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 no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -4604,7 +4662,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -4615,7 +4673,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -4626,32 +4684,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ 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 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'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -4694,33 +4752,38 @@ if ${lt_cv_path_NM+:} false; then :
else
if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ 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
+ 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"
+ 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
+ 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:
+ # 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'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -4731,15 +4794,15 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
@@ -4845,9 +4908,9 @@ esac
fi
fi
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -4855,8 +4918,8 @@ fi
esac
fi
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -4907,7 +4970,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -4947,7 +5010,7 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# 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`
@@ -4997,22 +5060,23 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
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`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# 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"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -5030,7 +5094,7 @@ else
fi
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
@@ -5048,30 +5112,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
@@ -5194,13 +5234,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -5328,13 +5368,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[4-9]*)
@@ -5361,8 +5401,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -5398,10 +5437,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5440,7 +5475,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5462,8 +5497,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -5516,6 +5551,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -5673,8 +5711,8 @@ else
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -5686,7 +5724,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
@@ -5841,7 +5879,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -5849,7 +5887,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -5862,7 +5900,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
$as_echo "$lt_cv_ar_at_file" >&6; }
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -6079,7 +6117,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -6169,7 +6207,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[ABCDEGRST]'
fi
;;
@@ -6202,14 +6240,44 @@ case `$NM -V 2>&1` in
symcode='[ABCDGIRSTW]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-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_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -6227,21 +6295,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -6289,11 +6360,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
@@ -6319,7 +6390,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -6339,13 +6410,13 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -6366,7 +6437,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -6419,6 +6490,16 @@ fi
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
$as_echo_n "checking for sysroot... " >&6; }
@@ -6431,9 +6512,9 @@ fi
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -6443,8 +6524,8 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
;;
esac
@@ -6456,18 +6537,99 @@ $as_echo "${lt_sysroot:-no}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+ ac_path_lt_DD_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
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in dd; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+ $ac_path_lt_DD_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_lt_DD"; then
+ :
+ fi
+else
+ ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6476,24 +6638,25 @@ ia64-*-hpux*)
test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -6522,9 +6685,50 @@ ia64-*-hpux*)
rm -rf conftest*
;;
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6538,7 +6742,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux"
@@ -6583,7 +6794,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -6623,13 +6834,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
$as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6641,7 +6853,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -6650,7 +6862,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -6666,7 +6878,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -6777,7 +6989,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
@@ -7280,7 +7492,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -7298,7 +7510,7 @@ else
cat conftest.err >&5
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
@@ -7337,7 +7549,7 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -7366,7 +7578,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&5
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
@@ -7379,32 +7591,32 @@ fi
$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[012][,.]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -7412,6 +7624,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
;;
esac
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7706,14 +7953,14 @@ if test "${enable_static+set}" = set; then :
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -7744,14 +7991,14 @@ if test "${enable_shared+set}" = set; then :
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -7776,14 +8023,14 @@ if test "${with_pic+set}" = set; then :
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -7791,8 +8038,6 @@ else
fi
-test -z "$pic_mode" && pic_mode=default
-
@@ -7808,14 +8053,14 @@ if test "${enable_fast_install+set}" = set; then :
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -7829,11 +8074,63 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -7882,7 +8179,7 @@ test -z "$LN_S" && LN_S="ln -s"
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -7921,7 +8218,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -7932,14 +8229,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -7948,15 +8245,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$LD" && LD=ld
test -z "$ac_objext" && ac_objext=o
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
# Only perform the check for file, if the check method requires it
@@ -7971,22 +8261,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -f "$ac_dir/${ac_tool_prefix}file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 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
:
@@ -8009,13 +8299,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -8037,22 +8327,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -f "$ac_dir/file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 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
:
@@ -8075,13 +8365,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -8102,7 +8392,7 @@ esac
# Use C for the default configuration in the libtool script
-lt_save_CC="$CC"
+lt_save_CC=$CC
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8164,7 +8454,7 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -8180,7 +8470,7 @@ else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
# 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
@@ -8210,7 +8500,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
else
:
@@ -8228,17 +8518,18 @@ lt_prog_compiler_pic=
lt_prog_compiler_static=
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_static='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
fi
+ lt_prog_compiler_pic='-fPIC'
;;
amigaos*)
@@ -8249,8 +8540,8 @@ lt_prog_compiler_static=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -8266,6 +8557,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -8336,7 +8632,7 @@ lt_prog_compiler_static=
case $host_os in
aix*)
lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
else
@@ -8344,10 +8640,29 @@ lt_prog_compiler_static=
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -8363,7 +8678,7 @@ lt_prog_compiler_static=
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
+ lt_prog_compiler_static='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -8372,9 +8687,9 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
@@ -8399,6 +8714,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-PIC'
lt_prog_compiler_static='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -8496,7 +8817,7 @@ lt_prog_compiler_static=
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
lt_prog_compiler_pic='-Kconform_pic'
lt_prog_compiler_static='-Bstatic'
fi
@@ -8525,7 +8846,7 @@ lt_prog_compiler_static=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
;;
@@ -8557,7 +8878,7 @@ else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
# 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
@@ -8587,7 +8908,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8619,7 +8940,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -8638,13 +8959,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
:
else
lt_prog_compiler_static=
@@ -8764,8 +9085,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -8777,9 +9098,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -8822,9 +9143,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# included in the symbol list
include_expsyms=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -8839,7 +9160,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -8847,7 +9168,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
esac
@@ -8857,7 +9178,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -8879,24 +9200,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ 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'
+ 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'
+ 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>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -8909,7 +9230,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -8928,7 +9249,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -8944,7 +9265,7 @@ _LT_EOF
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${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
@@ -8954,7 +9275,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
- export_dynamic_flag_spec='${wl}--export-all-symbols'
+ export_dynamic_flag_spec='$wl--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -8962,61 +9283,89 @@ _LT_EOF
exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- 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
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $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
;;
haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ 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'
+ 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'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# 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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -9027,42 +9376,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; 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~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -9076,8 +9430,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -9095,8 +9449,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -9108,7 +9462,7 @@ _LT_EOF
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** 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
@@ -9123,9 +9477,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- 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'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ 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
@@ -9142,15 +9496,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $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" = no; then
+ if test no = "$ld_shlibs"; then
runpath_var=
hardcode_libdir_flag_spec=
export_dynamic_flag_spec=
@@ -9166,7 +9520,7 @@ _LT_EOF
# 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 "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
@@ -9174,34 +9528,57 @@ _LT_EOF
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
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'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -9220,13 +9597,21 @@ _LT_EOF
hardcode_direct_absolute=yes
hardcode_libdir_separator=':'
link_all_deplibs=yes
- file_list_spec='${wl}-f,'
+ file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
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`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -9245,35 +9630,42 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec='${wl}-bexpall'
+ export_dynamic_flag_spec='$wl-bexpall'
# 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
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; 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.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -9308,7 +9700,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -9316,17 +9708,17 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- 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 func_echo_all "${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 -n "$allow_undefined_flag"; then func_echo_all "$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'
+ if test ia64 = "$host_cpu"; 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 $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_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.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -9361,7 +9753,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -9369,21 +9761,33 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag=' ${wl}-bernotok'
- allow_undefined_flag=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag=' $wl-bernotok'
+ allow_undefined_flag=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # 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'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -9392,7 +9796,7 @@ fi
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -9422,16 +9826,17 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
enable_shared_with_static_runtimes=yes
@@ -9440,18 +9845,18 @@ fi
# Don't use ranlib
old_postinstall_cmds='chmod 644 $oldlib'
postlink_cmds='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -9460,7 +9865,7 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -9479,24 +9884,24 @@ fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec=''
fi
link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
+ allow_undefined_flag=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
else
ld_shlibs=no
@@ -9538,33 +9943,33 @@ fi
;;
hpux9*)
- if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$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'
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ archive_cmds='$CC -shared $pic_flag $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'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ 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
@@ -9572,25 +9977,25 @@ fi
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 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='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -9602,7 +10007,7 @@ if ${lt_cv_prog_compiler__b+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -b"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -9621,14 +10026,14 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
$as_echo "$lt_cv_prog_compiler__b" >&6; }
-if test x"$lt_cv_prog_compiler__b" = xyes; then
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+ archive_cmds='$CC -b $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
@@ -9636,8 +10041,8 @@ fi
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
case $host_cpu in
@@ -9648,7 +10053,7 @@ fi
*)
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -9659,8 +10064,8 @@ fi
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
@@ -9670,8 +10075,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >
if ${lt_cv_irix_exported_symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int foo (void) { return 0; }
@@ -9683,24 +10088,34 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- if test "$lt_cv_irix_exported_symbol" = yes; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
inherit_rpath=yes
link_all_deplibs=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -9715,7 +10130,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
newsos6)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
hardcode_shlibpath_var=no
;;
@@ -9723,27 +10138,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
hardcode_shlibpath_var=no
hardcode_direct_absolute=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
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'
+ 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
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
fi
else
ld_shlibs=no
@@ -9754,33 +10161,53 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
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 $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
;;
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} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$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='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-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; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_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'
@@ -9791,24 +10218,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris*)
no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $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 $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 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'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ archive_cmds='$CC -G$allow_undefined_flag -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -9818,11 +10245,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
fi
@@ -9832,10 +10259,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; 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 $libobjs $deplibs $compiler_flags'
+ 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
@@ -9884,43 +10311,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
+ no_undefined_flag='$wl-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- 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'
+ if test yes = "$GCC"; then
+ 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,$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'
+ 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
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT 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'
+ 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='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec='$wl-R,$libdir'
hardcode_libdir_separator=':'
link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
+ export_dynamic_flag_spec='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- 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'
+ if test yes = "$GCC"; then
+ 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,$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'
+ 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
;;
@@ -9935,10 +10362,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- export_dynamic_flag_spec='${wl}-Blargedynsym'
+ export_dynamic_flag_spec='$wl-Blargedynsym'
;;
esac
fi
@@ -9946,7 +10373,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
with_gnu_ld=$with_gnu_ld
@@ -9972,7 +10399,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -10187,14 +10614,14 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -10210,28 +10637,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -10245,7 +10679,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -10254,7 +10688,7 @@ fi
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -10271,14 +10705,16 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -10286,41 +10722,91 @@ aix[4-9]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -10330,18 +10816,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
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=`func_echo_all "$lib" | $SED '\''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=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -10349,8 +10835,8 @@ beos*)
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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 $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -10362,7 +10848,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -10371,8 +10857,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ 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~
@@ -10388,17 +10874,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
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
dynamic_linker='Win32 ld.exe'
@@ -10407,8 +10893,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -10435,7 +10921,7 @@ cygwin* | mingw* | pw32* | cegcc*)
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -10448,8 +10934,8 @@ cygwin* | mingw* | pw32* | cegcc*)
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ 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'
@@ -10462,7 +10948,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -10475,8 +10961,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -10489,8 +10975,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
;;
@@ -10508,12 +10994,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${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'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -10538,26 +11025,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- 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
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -10575,14 +11051,15 @@ hpux9* | hpux10* | hpux11*)
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
+ 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 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -10590,8 +11067,8 @@ hpux9* | hpux10* | hpux11*)
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'
+ 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
;;
@@ -10600,8 +11077,8 @@ hpux9* | hpux10* | hpux11*)
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'
+ 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, ...
@@ -10614,8 +11091,8 @@ interix[3-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -10626,7 +11103,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -10634,8 +11111,8 @@ irix5* | irix6* | nonstopux*)
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}'
+ 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=
@@ -10654,8 +11131,8 @@ irix5* | irix6* | nonstopux*)
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}"
+ 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
;;
@@ -10664,13 +11141,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # 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
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -10717,11 +11214,15 @@ fi
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10738,12 +11239,12 @@ netbsd*)
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'
+ 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'
+ 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
shlibpath_var=LD_LIBRARY_PATH
@@ -10753,7 +11254,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ 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
;;
@@ -10762,58 +11263,68 @@ newsos6)
version_type=qnx
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'
+ 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='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ 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
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ 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
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ 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~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
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}'
+ 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"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -10824,8 +11335,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -10835,11 +11346,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ 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
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -10847,8 +11358,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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)
@@ -10869,24 +11380,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ 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
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
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'
+ 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
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -10904,7 +11415,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -10912,8 +11423,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -10923,20 +11434,35 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -11033,15 +11559,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
+ test yes = "$hardcode_automatic"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
+ if test no != "$hardcode_direct" &&
# 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_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+ test no != "$hardcode_minus_L"; then
# Linking always hardcodes the temporary library directory.
hardcode_action=relink
else
@@ -11056,12 +11582,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+ test yes = "$inherit_rpath"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -11071,7 +11597,7 @@ fi
- if test "x$enable_dlopen" != xyes; then
+ if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -11081,23 +11607,23 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -11135,10 +11661,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
- lt_cv_dlopen="dyld"
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
@@ -11146,10 +11672,18 @@ fi
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
if test "x$ac_cv_func_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load"
+ lt_cv_dlopen=shl_load
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -11188,11 +11722,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
if test "x$ac_cv_func_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -11231,7 +11765,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -11270,7 +11804,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -11309,7 +11843,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
fi
@@ -11330,21 +11864,21 @@ fi
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -11352,7 +11886,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11399,9 +11933,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -11431,7 +11965,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11451,14 +11985,14 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
$as_echo "$lt_cv_dlopen_self" >&6; }
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11505,9 +12039,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -11537,7 +12071,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11558,9 +12092,9 @@ fi
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -11604,7 +12138,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -11632,7 +12166,7 @@ fi
- # Report which library types will actually be built
+ # Report what library types will actually be built
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -11640,13 +12174,13 @@ $as_echo "$can_build_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
$as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -11654,8 +12188,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -11665,7 +12203,7 @@ $as_echo "$enable_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -11679,7 +12217,7 @@ 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
-CC="$lt_save_CC"
+CC=$lt_save_CC
@@ -13525,15 +14063,15 @@ fi
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
esac
} # func_stripname_cnf
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+ if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13712,7 +14250,7 @@ objext_CXX=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -13773,46 +14311,39 @@ $RM -r conftest*
CFLAGS=$CXXFLAGS
compiler=$CC
compiler_CXX=$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 "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
else
lt_prog_compiler_no_builtin_flag_CXX=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
# 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 no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -13826,7 +14357,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -13837,7 +14368,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -13848,32 +14379,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ 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 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'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -13909,22 +14440,22 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# 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 $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC $pic_flag -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'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec_CXX=
fi
@@ -13961,18 +14492,30 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs_CXX=no
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
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.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -13982,6 +14525,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -14000,13 +14550,21 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
hardcode_direct_absolute_CXX=yes
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- file_list_spec_CXX='${wl}-f,'
+ file_list_spec_CXX='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
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`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -14024,36 +14582,44 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec_CXX='${wl}-bexpall'
+ export_dynamic_flag_spec_CXX='$wl-bexpall'
# 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
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ no_undefined_flag_CXX='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -14088,7 +14654,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -14096,18 +14662,18 @@ fi
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
- 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 func_echo_all "${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 -n "$allow_undefined_flag"; then func_echo_all "$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'
+ if test ia64 = "$host_cpu"; 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 $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_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.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -14142,7 +14708,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -14150,22 +14716,34 @@ fi
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag_CXX=' ${wl}-bernotok'
- allow_undefined_flag_CXX=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag_CXX=' $wl-bernotok'
+ allow_undefined_flag_CXX=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX='$convenience'
fi
archive_cmds_need_lc_CXX=yes
- # 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'
+ archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -14175,7 +14753,7 @@ fi
allow_undefined_flag_CXX=unsupported
# Joseph Beckenbach <jrb3 at best.com> 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'
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs_CXX=no
fi
@@ -14203,57 +14781,58 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
enable_shared_with_static_runtimes_CXX=yes
# Don't use ranlib
old_postinstall_cmds_CXX='chmod 644 $oldlib'
postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+ export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
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 $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
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $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'
+ 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, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $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
@@ -14267,27 +14846,27 @@ fi
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec_CXX=''
fi
link_all_deplibs_CXX=yes
- allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ allow_undefined_flag_CXX=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- 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${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed '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${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ 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$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed '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$_lt_dar_export_syms$_lt_dsymutil"
fi
else
@@ -14296,6 +14875,34 @@ fi
;;
+ os2*)
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_minus_L_CXX=yes
+ allow_undefined_flag_CXX=unsupported
+ shrext_cmds=.dll
+ archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes_CXX=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -14330,18 +14937,15 @@ fi
ld_shlibs_CXX=yes
;;
- gnu*)
- ;;
-
haiku*)
- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs_CXX=yes
;;
hpux9*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
hardcode_direct_CXX=yes
hardcode_minus_L_CXX=yes # Not in the search PATH,
# but as the default
@@ -14353,7 +14957,7 @@ fi
ld_shlibs_CXX=no
;;
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'
+ 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 "x$output_objdir/$soname" = "x$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.
@@ -14362,11 +14966,11 @@ fi
# 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; func_echo_all "$list"'
+ 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; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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'
+ if test yes = "$GXX"; then
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -14376,15 +14980,15 @@ fi
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
;;
esac
fi
@@ -14410,13 +15014,13 @@ fi
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'
+ 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+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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 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
@@ -14427,20 +15031,20 @@ fi
# 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) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$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; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
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'
+ 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 $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -14455,22 +15059,22 @@ fi
interix[3-9]*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}-E'
+ 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'
+ 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*)
# SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_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" && func_echo_all "-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
@@ -14479,22 +15083,22 @@ fi
old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
link_all_deplibs_CXX=yes
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -14502,8 +15106,8 @@ fi
# 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 $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'
+ 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.
@@ -14512,10 +15116,10 @@ fi
# 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 $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -14529,59 +15133,59 @@ fi
# 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'
+ 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'
+ 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
- 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'
+ 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'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [1-5].* | *pgcpp\ [1-5].*)
prelink_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
old_archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- 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'
+ 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'
;;
esac
- 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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ 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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- 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'
+ 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'
@@ -14595,18 +15199,18 @@ fi
# 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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -14614,10 +15218,10 @@ fi
*Sun\ C*)
# Sun C++ 5.9
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
hardcode_libdir_flag_spec_CXX='-R$libdir'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object_CXX=yes
# Not sure whether something based on
@@ -14675,22 +15279,17 @@ fi
ld_shlibs_CXX=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- ld_shlibs_CXX=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
hardcode_direct_absolute_CXX=yes
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'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; 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=func_echo_all
else
@@ -14706,9 +15305,9 @@ fi
# 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --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_flag_spec_CXX='$wl-rpath,$libdir'
hardcode_libdir_separator_CXX=:
# Archives containing C++ object files must be created using
@@ -14726,17 +15325,17 @@ fi
cxx*)
case $host in
osf3*)
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
;;
*)
allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_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" && func_echo_all "-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 $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'
+ echo "-hidden">> $lib.exp~
+ $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'
;;
esac
@@ -14751,21 +15350,21 @@ fi
# 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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_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" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
# Commands to make compiler produce verbose output that lists
@@ -14811,9 +15410,9 @@ fi
# 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} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 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} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$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
@@ -14821,7 +15420,7 @@ fi
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
;;
@@ -14838,30 +15437,30 @@ fi
;;
gcx*)
# Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${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'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ no_undefined_flag_CXX=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $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 $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -G -nostdlib $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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
@@ -14869,11 +15468,11 @@ fi
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -14882,52 +15481,52 @@ fi
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_CXX='${wl}-z,text'
+ 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 -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'
+ 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
+ # Note: We CANNOT 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_CXX='${wl}-z,text'
- allow_undefined_flag_CXX='${wl}-z,nodefs'
+ 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='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ export_dynamic_flag_spec_CXX='$wl-Bexport'
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 -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'
old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
- '"$old_archive_cmds_CXX"
+ '"$old_archive_cmds_CXX"
reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
- '"$reload_cmds_CXX"
+ '"$reload_cmds_CXX"
;;
*)
- 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'
+ 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
;;
@@ -14959,10 +15558,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
+ test no = "$ld_shlibs_CXX" && can_build_shared=no
- GCC_CXX="$GXX"
- LD_CXX="$LD"
+ GCC_CXX=$GXX
+ LD_CXX=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -15006,13 +15605,13 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -15028,16 +15627,16 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$compiler_lib_search_path_CXX"; then
- compiler_lib_search_path_CXX="${prev}${p}"
+ compiler_lib_search_path_CXX=$prev$p
else
- compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -15045,9 +15644,9 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
esac
else
if test -z "$postdeps_CXX"; then
- postdeps_CXX="${prev}${p}"
+ postdeps_CXX=$prev$p
else
- postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+ postdeps_CXX="${postdeps_CXX} $prev$p"
fi
fi
prev=
@@ -15062,15 +15661,15 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$predep_objects_CXX"; then
- predep_objects_CXX="$p"
+ predep_objects_CXX=$p
else
predep_objects_CXX="$predep_objects_CXX $p"
fi
else
if test -z "$postdep_objects_CXX"; then
- postdep_objects_CXX="$p"
+ postdep_objects_CXX=$p
else
postdep_objects_CXX="$postdep_objects_CXX $p"
fi
@@ -15100,51 +15699,6 @@ interix[3-9]*)
postdep_objects_CXX=
postdeps_CXX=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # 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.
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
@@ -15153,7 +15707,7 @@ case " $postdeps_CXX " in
esac
compiler_lib_search_dirs_CXX=
if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
@@ -15192,17 +15746,18 @@ lt_prog_compiler_static_CXX=
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
fi
+ lt_prog_compiler_pic_CXX='-fPIC'
;;
amigaos*)
@@ -15213,8 +15768,8 @@ lt_prog_compiler_static_CXX=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -15229,6 +15784,11 @@ lt_prog_compiler_static_CXX=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static_CXX='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -15278,7 +15838,7 @@ lt_prog_compiler_static_CXX=
case $host_os in
aix[4-9]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
else
@@ -15318,14 +15878,14 @@ lt_prog_compiler_static_CXX=
case $cc_basename in
CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
lt_prog_compiler_pic_CXX='+Z'
fi
;;
aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -15354,7 +15914,7 @@ lt_prog_compiler_static_CXX=
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -15362,7 +15922,7 @@ lt_prog_compiler_static_CXX=
lt_prog_compiler_pic_CXX='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
@@ -15507,7 +16067,7 @@ lt_prog_compiler_static_CXX=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
;;
@@ -15539,7 +16099,7 @@ else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment
# 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
@@ -15569,7 +16129,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -15595,7 +16155,7 @@ if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -15614,13 +16174,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
:
else
lt_prog_compiler_static_CXX=
@@ -15734,8 +16294,8 @@ $as_echo "$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
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -15747,9 +16307,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -15766,17 +16326,21 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- export_symbols_cmds_CXX="$ltdll_cmds"
+ export_symbols_cmds_CXX=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -15796,7 +16360,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
+test no = "$ld_shlibs_CXX" && can_build_shared=no
with_gnu_ld_CXX=$with_gnu_ld
@@ -15813,7 +16377,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc_CXX=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds_CXX in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -15941,7 +16505,7 @@ $as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -15958,14 +16522,16 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -15973,41 +16539,91 @@ aix[4-9]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -16017,18 +16633,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
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=`func_echo_all "$lib" | $SED '\''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=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -16036,8 +16652,8 @@ beos*)
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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 $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -16049,7 +16665,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -16058,8 +16674,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ 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~
@@ -16075,16 +16691,16 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
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
dynamic_linker='Win32 ld.exe'
@@ -16093,8 +16709,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -16121,7 +16737,7 @@ cygwin* | mingw* | pw32* | cegcc*)
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -16134,8 +16750,8 @@ cygwin* | mingw* | pw32* | cegcc*)
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ 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'
@@ -16148,7 +16764,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -16161,8 +16777,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16174,8 +16790,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
;;
@@ -16193,12 +16809,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${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'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -16223,26 +16840,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- 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
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -16260,14 +16866,15 @@ hpux9* | hpux10* | hpux11*)
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
+ 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 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -16275,8 +16882,8 @@ hpux9* | hpux10* | hpux11*)
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'
+ 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
;;
@@ -16285,8 +16892,8 @@ hpux9* | hpux10* | hpux11*)
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'
+ 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, ...
@@ -16299,8 +16906,8 @@ interix[3-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -16311,7 +16918,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -16319,8 +16926,8 @@ irix5* | irix6* | nonstopux*)
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}'
+ 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=
@@ -16339,8 +16946,8 @@ irix5* | irix6* | nonstopux*)
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}"
+ 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
;;
@@ -16349,13 +16956,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # 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
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -16402,11 +17029,15 @@ fi
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -16423,12 +17054,12 @@ netbsd*)
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'
+ 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'
+ 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
shlibpath_var=LD_LIBRARY_PATH
@@ -16438,7 +17069,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ 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
;;
@@ -16447,58 +17078,68 @@ newsos6)
version_type=qnx
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'
+ 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='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ 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
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ 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
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ 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~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
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}'
+ 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"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -16509,8 +17150,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -16520,11 +17161,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ 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
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -16532,8 +17173,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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)
@@ -16554,24 +17195,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ 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
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
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'
+ 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
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -16589,7 +17230,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -16597,8 +17238,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -16608,20 +17249,32 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
@@ -16664,15 +17317,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&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 yes = "$hardcode_automatic_CXX"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct_CXX" != no &&
+ if test no != "$hardcode_direct_CXX" &&
# 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_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+ test no != "$hardcode_minus_L_CXX"; then
# Linking always hardcodes the temporary library directory.
hardcode_action_CXX=relink
else
@@ -16687,12 +17340,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
$as_echo "$hardcode_action_CXX" >&6; }
-if test "$hardcode_action_CXX" = relink ||
- test "$inherit_rpath_CXX" = yes; then
+if test relink = "$hardcode_action_CXX" ||
+ test yes = "$inherit_rpath_CXX"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -16715,7 +17368,7 @@ fi
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -18308,6 +18961,40 @@ _ACEOF
$as_echo "#define ENABLE_ID3LIB /**/" >>confdefs.h
ID3LIB_VERSION="(id3lib-$ID3LIB_MAJOR.$ID3LIB_MINOR.$ID3LIB_PATCH)"
+ ac_fn_c_check_decl "$LINENO" "ID3Field_SetEncoding" "ac_cv_have_decl_ID3Field_SetEncoding" "#include <id3.h>
+"
+if test "x$ac_cv_have_decl_ID3Field_SetEncoding" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ID3FIELD_SETENCODING $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "ID3Field_GetEncoding" "ac_cv_have_decl_ID3Field_GetEncoding" "#include <id3.h>
+"
+if test "x$ac_cv_have_decl_ID3Field_GetEncoding" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ID3FIELD_GETENCODING $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "ID3Field_IsEncodable" "ac_cv_have_decl_ID3Field_IsEncodable" "#include <id3.h>
+"
+if test "x$ac_cv_have_decl_ID3Field_IsEncodable" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ID3FIELD_ISENCODABLE $ac_have_decl
+_ACEOF
+
else
have_id3lib=no
fi
@@ -18496,9 +19183,11 @@ fi
GIO_DEPS="gio-2.0 >= 2.32.0" GLIB_DEPRECATION_FLAGS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
+
GTK_DEPS="gtk+-3.0 >= 3.4.0"
GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EASYTAG" >&5
$as_echo_n "checking for EASYTAG... " >&6; }
@@ -18685,8 +19374,13 @@ fi
+ # C support is enabled by default.
+ # Only enable C++ support if AC_PROG_CXX is called. The redefinition of
+ # AC_PROG_CXX is so that a fatal error is emitted if this macro is called
+ # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be
+ # checked.
@@ -18703,8 +19397,22 @@ else
fi
fi
+ # Check whether --enable-Werror was given.
+if test "${enable_Werror+set}" = set; then :
+ enableval=$enable_Werror;
+else
+ enable_Werror=maybe
+fi
+
# Return the user’s chosen warning level
+ if test "$enable_Werror" = "no" -a \
+ "$enable_compile_warnings" = "error"; then :
+
+ enable_compile_warnings="maximum"
+
+fi
+
ax_enable_compile_warnings=$enable_compile_warnings
@@ -18718,6 +19426,13 @@ fi
# Variable names
+ 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
+
+
# Always pass -Werror=unknown-warning-option to get Clang to fail on bad
# flags, otherwise they are always appended to the warn_cflags variable, and
# Clang warns on them for every compilation unit.
@@ -18840,6 +19555,10 @@ fi
done
+ # In the flags below, when disabling specific flags, always add *both*
+ # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example)
+ # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall,
+ # which effectively turns that flag back on again as an error.
if test "$ax_enable_compile_warnings" != "no"; then :
# "minimum" flags
@@ -18928,7 +19647,7 @@ fi
-for flag in -Wextra -Wundef -Wnested-externs -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wno-unused-parameter -Wno-missing-field-initializers -Wdeclaration-after-statement -Wformat=2 -Wold-style-definition -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wimplicit-function-declaration -Wreturn-type ; do
+for flag in -Wextra -Wundef -Wnested-externs -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wno-unused-parameter -Wno-error=unused-parameter -Wno-missing-field-initializers -Wno-error=missing-field-initializers -Wdeclaration-after-statement -Wformat=2 -Wold-style-definition -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wimplicit-function-declaration -Wreturn-type ; do
as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
@@ -19200,6 +19919,13 @@ done
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
+
+
# Substitute the variables
@@ -19343,6 +20069,10 @@ fi
done
+ # In the flags below, when disabling specific flags, always add *both*
+ # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example)
+ # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall,
+ # which effectively turns that flag back on again as an error.
if test "$ax_enable_compile_warnings" != "no"; then :
# "minimum" flags
@@ -19431,7 +20161,7 @@ fi
-for flag in -Wextra -Wundef -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wredundant-decls -Wno-unused-parameter -Wno-missing-field-initializers -Wformat=2 -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wreturn-type -Wno-overloaded-virtual ; do
+for flag in -Wextra -Wundef -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wredundant-decls -Wno-unused-parameter -Wno-error=unused-parameter -Wno-missing-field-initializers -Wno-error=missing-field-initializers -Wformat=2 -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wreturn-type -Wno-overloaded-virtual -Wno-error=overloaded-virtual ; do
as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
@@ -21183,7 +21913,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by EasyTAG $as_me 2.3.4, which was
+This file was extended by EasyTAG $as_me 2.3.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21250,7 +21980,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-EasyTAG config.status 2.3.4
+EasyTAG config.status 2.3.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -21385,6 +22115,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -21434,10 +22165,13 @@ compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -21502,7 +22236,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -21607,9 +22342,12 @@ CFLAGS \
compiler \
lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
nm_file_list_spec \
+lt_cv_truncate_bin \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_pic \
lt_prog_compiler_wl \
@@ -21675,7 +22413,7 @@ postdeps_CXX \
compiler_lib_search_path_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -21702,7 +22440,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
@@ -21716,7 +22455,7 @@ prelink_cmds_CXX \
postlink_cmds_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -21725,19 +22464,16 @@ postlink_cmds_CXX; do
done
ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'
@@ -22453,55 +23189,53 @@ $as_echo X"$file" |
;;
"libtool":C)
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The names of the tagged configurations supported by this script.
-available_tags="CXX "
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -22521,6 +23255,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -22638,18 +23375,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
# Transform the output of nm in a proper C declaration.
global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
# Transform the output of nm in a C name address pair.
global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
# Specify filename containing input files for \$NM.
nm_file_list_spec=$lt_nm_file_list_spec
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
lt_sysroot=$lt_sysroot
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -22740,8 +23486,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -22834,13 +23583,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute
@@ -22906,13 +23655,72 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -22921,7 +23729,7 @@ _LT_EOF
esac
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# We use sed instead of cat because bash on DJGPP gets confused if
@@ -22931,165 +23739,6 @@ ltmain="$ac_aux_dir/ltmain.sh"
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- if test x"$xsi_shell" = xyes; then
- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\ # positional parameters, so assign one to ordinary parameter first.\
-\ func_stripname_result=${3}\
-\ func_stripname_result=${func_stripname_result#"${1}"}\
-\ func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\ func_split_long_opt_name=${1%%=*}\
-\ func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\ func_split_short_opt_arg=${1#??}\
-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\ case ${1} in\
-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\ *) func_lo2o_result=${1} ;;\
-\ esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
- func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
- func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
- func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
- sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
- eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\ func_quote_for_eval "${2}"\
-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -23176,13 +23825,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute_CXX
@@ -23314,7 +23963,6 @@ echo
echo Source code location ....: $srcdir
echo Host System Type ........: $host
echo Preprocessor ............: $CC $CPPFLAGS
-echo Deprecation defines .....: $DEPRECATED_CPPFLAGS
echo Compiler ................: $CC $CFLAGS
echo Compiler warnings .......: $WARN_CFLAGS
echo C++ Compiler warnings ...: $WARN_CXXFLAGS
diff --git a/configure.ac b/configure.ac
index 82463e1..ba47c8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ([2.64])
dnl To set also in config.h.mingw
dnl defines ($PACKAGE_NAME, $PACKAGE_VERSION, etc.)
-AC_INIT([EasyTAG], [2.3.4], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
+AC_INIT([EasyTAG], [2.3.5], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
@@ -277,7 +277,12 @@ AS_IF([test "x$have_mp3" = "xyes" -a "x$enable_id3v23" != "xno"],
AC_SUBST([ID3LIB_LIBS], [$ac_cv_search_ID3Tag_Link])
AC_DEFINE([ENABLE_ID3LIB], [], [Define for ID3v2.3 support])
- ID3LIB_VERSION="(id3lib-$ID3LIB_MAJOR.$ID3LIB_MINOR.$ID3LIB_PATCH)"],
+ ID3LIB_VERSION="(id3lib-$ID3LIB_MAJOR.$ID3LIB_MINOR.$ID3LIB_PATCH)"
+ AC_CHECK_DECLS([ID3Field_SetEncoding,
+ ID3Field_GetEncoding,
+ ID3Field_IsEncodable],
+ [], [],
+ [[#include <id3.h>]])],
[have_id3lib=no])
@@ -330,9 +335,11 @@ AM_CONDITIONAL([ENABLE_NAUTILUS_ACTIONS], [test x"$have_libnautilus_extension" !
dnl Check the pkg-config dependencies
GIO_DEPS="gio-2.0 >= 2.32.0" dnl For g_file_new_tmp()
-GLIB_DEPRECATION_FLAGS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
+AC_SUBST([GLIB_DEPRECATION_FLAGS],
+ ["-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"])
GTK_DEPS="gtk+-3.0 >= 3.4.0"
-GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"
+AC_SUBST([GTK_DEPRECATION_FLAGS],
+ ["-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"])
PKG_CHECK_MODULES([EASYTAG], [$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS])
dnl Check for winsock
@@ -372,7 +379,6 @@ echo
echo Source code location ....: $srcdir
echo Host System Type ........: $host
echo Preprocessor ............: $CC $CPPFLAGS
-echo Deprecation defines .....: $DEPRECATED_CPPFLAGS
echo Compiler ................: $CC $CFLAGS
echo Compiler warnings .......: $WARN_CFLAGS
echo C++ Compiler warnings ...: $WARN_CXXFLAGS
diff --git a/data/scan_dialog.ui b/data/scan_dialog.ui
index fa5baab..3fc2a0e 100644
--- a/data/scan_dialog.ui
+++ b/data/scan_dialog.ui
@@ -308,7 +308,7 @@
<child>
<object class="GtkLabel" id="track_label">
<property name="halign">start</property>
- <property name="label" translatable="yes">%n: track</property>
+ <property name="label" translatable="yes">%n: track number</property>
<property name="visible">True</property>
</object>
<packing>
diff --git a/help/Makefile.in b/help/Makefile.in
index bd4f8d3..e0f5cb3 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -175,12 +175,14 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIT = @GIT@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
+GLIB_DEPRECATION_FLAGS = @GLIB_DEPRECATION_FLAGS@
GLIB_MKENUMS = @GLIB_MKENUMS@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTESTER = @GTESTER@
GTESTER_REPORT = @GTESTER_REPORT@
+GTK_DEPRECATION_FLAGS = @GTK_DEPRECATION_FLAGS@
HELP_DIR = @HELP_DIR@
ID3LIB_LIBS = @ID3LIB_LIBS@
INSTALL = @INSTALL@
@@ -205,6 +207,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/m4/ax_compiler_flags.m4 b/m4/ax_compiler_flags.m4
index 1781b40..84cd882 100644
--- a/m4/ax_compiler_flags.m4
+++ b/m4/ax_compiler_flags.m4
@@ -25,7 +25,9 @@
#
# By providing a consistent --enable-compile-warnings argument across all
# projects using this macro, continuous integration systems can easily be
-# configured the same for all projects.
+# configured the same for all projects. Automated systems or build
+# systems aimed at beginners may want to pass the --disable-Werror
+# argument to unconditionally prevent warnings being fatal.
#
# --enable-compile-warnings can take the values:
#
@@ -35,6 +37,8 @@
# * maximum: The above, plus additional warnings which enforce a particular
# coding style
# * error: The above, plus -Werror so that all warnings are fatal.
+# Use --disable-Werror to override this and disable fatal
+# warnings.
#
# The set of flags enabled at each level can be augmented using the
# EXTRA-*-CFLAGS and EXTRA-*-LDFLAGS variables. Flags should not be
@@ -55,10 +59,11 @@
# be manually added to the CFLAGS and LDFLAGS variables for each target in
# the code base.
#
-# Warning flags for the C++ compiler are AC_SUBST-ed as WARN_CXXFLAGS, and
-# must be manually added to the CXXFLAGS variables for each target in the
-# code base. EXTRA-*-CFLAGS can be used to augment the flags enabled at
-# each level.
+# If C++ language support is enabled with AC_PROG_CXX, which must occur
+# before this macro in configure.ac, warning flags for the C++ compiler
+# are AC_SUBST-ed as WARN_CXXFLAGS, and must be manually added to the
+# CXXFLAGS variables for each target in the code base. EXTRA-*-CFLAGS can
+# be used to augment the flags enabled at each level.
#
# Warning flags for g-ir-scanner (from GObject Introspection) are
# AC_SUBST-ed as WARN_SCANNERFLAGS. This variable must be manually added
@@ -83,11 +88,25 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 7
+#serial 9
+
+# _AX_COMPILER_FLAGS_LANG([LANGNAME])
+m4_defun([_AX_COMPILER_FLAGS_LANG],
+[m4_ifdef([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [],
+ [m4_define([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [])dnl
+ AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_]$1[FLAGS])])dnl
+])
AC_DEFUN([AX_COMPILER_FLAGS],[
- AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_CFLAGS])
- AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_CXXFLAGS])
+ # C support is enabled by default.
+ _AX_COMPILER_FLAGS_LANG([C])
+ # Only enable C++ support if AC_PROG_CXX is called. The redefinition of
+ # AC_PROG_CXX is so that a fatal error is emitted if this macro is called
+ # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be
+ # checked.
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AX_COMPILER_FLAGS_LANG([CXX])],
+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AX_COMPILER_FLAGS_LANG([CXX])])])
AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_LDFLAGS])
AC_ARG_ENABLE([compile-warnings],
@@ -96,12 +115,22 @@ AC_DEFUN([AX_COMPILER_FLAGS],[
[AS_IF([test "$3" = "yes"],
[enable_compile_warnings="yes"],
[enable_compile_warnings="error"])])
+ AC_ARG_ENABLE([Werror],
+ AS_HELP_STRING([--disable-Werror],
+ [Unconditionally make all compiler warnings non-fatal]),,
+ [enable_Werror=maybe])
# Return the user’s chosen warning level
+ AS_IF([test "$enable_Werror" = "no" -a \
+ "$enable_compile_warnings" = "error"],[
+ enable_compile_warnings="maximum"
+ ])
+
ax_enable_compile_warnings=$enable_compile_warnings
AX_COMPILER_FLAGS_CFLAGS([$1],[$3],[$4],[$5],[$6],[$7],[$8])
- AX_COMPILER_FLAGS_CXXFLAGS([WARN_CXXFLAGS],[$3],[$4],[$5],[$6],[$7],[$8])
+ m4_ifdef([_AX_COMPILER_FLAGS_LANG_CXX_enabled],
+ [AX_COMPILER_FLAGS_CXXFLAGS([WARN_CXXFLAGS],[$3],[$4],[$5],[$6],[$7],[$8])])
AX_COMPILER_FLAGS_LDFLAGS([$2],[$3],[$9],[$10],[$11],[$12],[$13])
AX_COMPILER_FLAGS_GIR([WARN_SCANNERFLAGS],[$3])
])dnl AX_COMPILER_FLAGS
diff --git a/m4/ax_compiler_flags_cflags.m4 b/m4/ax_compiler_flags_cflags.m4
index 1f8ef1f..204f64c 100644
--- a/m4/ax_compiler_flags_cflags.m4
+++ b/m4/ax_compiler_flags_cflags.m4
@@ -25,7 +25,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 3
+#serial 5
AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS])
@@ -36,6 +36,8 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
m4_define(ax_warn_cflags_variable,
[m4_normalize(ifelse([$1],,[WARN_CFLAGS],[$1]))])
+ AC_LANG_PUSH([C])
+
# Always pass -Werror=unknown-warning-option to get Clang to fail on bad
# flags, otherwise they are always appended to the warn_cflags variable, and
# Clang warns on them for every compilation unit.
@@ -53,6 +55,10 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
$3 dnl
],ax_warn_cflags_variable,[$ax_compiler_flags_test])
+ # In the flags below, when disabling specific flags, always add *both*
+ # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example)
+ # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall,
+ # which effectively turns that flag back on again as an error.
AS_IF([test "$ax_enable_compile_warnings" != "no"],[
# "minimum" flags
AX_APPEND_COMPILE_FLAGS([ dnl
@@ -74,7 +80,9 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
-Wstrict-prototypes dnl
-Wredundant-decls dnl
-Wno-unused-parameter dnl
+ -Wno-error=unused-parameter dnl
-Wno-missing-field-initializers dnl
+ -Wno-error=missing-field-initializers dnl
-Wdeclaration-after-statement dnl
-Wformat=2 dnl
-Wold-style-definition dnl
@@ -122,6 +130,8 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
],ax_warn_cflags_variable,[$ax_compiler_flags_test])
])
+ AC_LANG_POP([C])
+
# Substitute the variables
AC_SUBST(ax_warn_cflags_variable)
])dnl AX_COMPILER_FLAGS
diff --git a/m4/ax_compiler_flags_cxxflags.m4 b/m4/ax_compiler_flags_cxxflags.m4
index 8f9c1a2..6031a6f 100644
--- a/m4/ax_compiler_flags_cxxflags.m4
+++ b/m4/ax_compiler_flags_cxxflags.m4
@@ -26,7 +26,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 1
+#serial 2
AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[
AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS])
@@ -56,6 +56,10 @@ AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[
$3 dnl
],ax_warn_cxxflags_variable,[$ax_compiler_flags_test])
+ # In the flags below, when disabling specific flags, always add *both*
+ # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example)
+ # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall,
+ # which effectively turns that flag back on again as an error.
AS_IF([test "$ax_enable_compile_warnings" != "no"],[
# "minimum" flags
AX_APPEND_COMPILE_FLAGS([ dnl
@@ -74,7 +78,9 @@ AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[
-Wmissing-declarations dnl
-Wredundant-decls dnl
-Wno-unused-parameter dnl
+ -Wno-error=unused-parameter dnl
-Wno-missing-field-initializers dnl
+ -Wno-error=missing-field-initializers dnl
-Wformat=2 dnl
-Wcast-align dnl
-Wformat-nonliteral dnl
@@ -93,6 +99,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[
-Warray-bounds dnl
-Wreturn-type dnl
-Wno-overloaded-virtual dnl
+ -Wno-error=overloaded-virtual dnl
$5 dnl
],ax_warn_cxxflags_variable,[$ax_compiler_flags_test])
])
diff --git a/m4/ax_compiler_flags_gir.m4 b/m4/ax_compiler_flags_gir.m4
index f26a8d2..99a27c1 100644
--- a/m4/ax_compiler_flags_gir.m4
+++ b/m4/ax_compiler_flags_gir.m4
@@ -26,7 +26,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 2
+#serial 3
AC_DEFUN([AX_COMPILER_FLAGS_GIR],[
AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
@@ -44,7 +44,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_GIR],[
--warn-all dnl
$4 dnl
],ax_warn_scannerflags_variable)
- ])
+ ])
AS_IF([test "$ax_enable_compile_warnings" != "no" -a \
"$ax_enable_compile_warnings" != "minimum"],[
# "yes" flags
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f12cfdf..a644432 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,8 +1,6 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,36 +8,30 @@
# modifications, as long as this notice is preserved.
m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 57 LT_INIT
+# serial 58 LT_INIT
# LT_PREREQ(VERSION)
@@ -67,7 +59,7 @@ esac
# LT_INIT([OPTIONS])
# ------------------
AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -91,7 +83,7 @@ dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -111,26 +103,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in @S|@*""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
# _LT_CC_BASENAME(CC)
# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
m4_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 "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
])
# _LT_FILEUTILS_DEFAULTS
# ----------------------
# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
m4_defun([_LT_FILEUTILS_DEFAULTS],
[: ${CP="cp -f"}
: ${MV="mv -f"}
@@ -177,15 +186,16 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -198,7 +208,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -209,14 +219,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -269,14 +279,14 @@ no_glob_subst='s/\*/\\\*/g'
# _LT_PROG_LTMAIN
# ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
# so we pass a copy along to make sure it has a sensible value anyway.
m4_defun([_LT_PROG_LTMAIN],
[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
])# _LT_PROG_LTMAIN
@@ -286,7 +296,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
# So that we can recreate a full libtool script including additional
# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
# label.
@@ -421,8 +431,8 @@ m4_define([_lt_decl_all_varnames],
# _LT_CONFIG_STATUS_DECLARE([VARNAME])
# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
@@ -446,7 +456,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
# Output comment and list of tags supported by the script
m4_defun([_LT_LIBTOOL_TAGS],
[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
])
@@ -474,7 +484,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
# _LT_LIBTOOL_CONFIG_VARS
# -----------------------
# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
# section) are produced by _LT_LIBTOOL_TAG_VARS.
m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -500,8 +510,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
# variables for single and double quote escaping we saved from calls
# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'. Finally, any additional code accumulated
# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
m4_defun([_LT_CONFIG_COMMANDS],
[AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -547,7 +557,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -560,7 +570,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -576,7 +586,7 @@ _LT_OUTPUT_LIBTOOL_INIT
# Generate a child script FILE with all initialization necessary to
# reuse the environment learned by the parent script, and make the
# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
+# '#!' sequence but before initialization text begins. After this
# macro, additional text can be appended to FILE to form the body of
# the child script. The macro ends with non-zero status if the
# file could not be fully written (such as if the disk is full).
@@ -598,7 +608,7 @@ AS_SHELL_SANITIZE
_AS_PREPARE
exec AS_MESSAGE_FD>&1
_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
@@ -621,7 +631,7 @@ exec AS_MESSAGE_LOG_FD>>config.log
} >&AS_MESSAGE_LOG_FD
lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
for use in further configure time tests before the real libtool is
generated.
@@ -643,7 +653,7 @@ Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-while test $[#] != 0
+while test 0 != $[#]
do
case $[1] in
--version | --v* | -V )
@@ -656,10 +666,10 @@ do
lt_cl_silent=: ;;
-*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
*) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
esac
shift
done
@@ -685,7 +695,7 @@ chmod +x "$CONFIG_LT"
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
lt_cl_success=:
-test "$silent" = yes &&
+test yes = "$silent" &&
lt_config_lt_args="$lt_config_lt_args --quiet"
exec AS_MESSAGE_LOG_FD>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
@@ -705,27 +715,31 @@ m4_defun([_LT_CONFIG],
_LT_CONFIG_SAVE_COMMANDS([
m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
_LT_COPYING
_LT_LIBTOOL_TAGS
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
# ### BEGIN LIBTOOL CONFIG
_LT_LIBTOOL_CONFIG_VARS
_LT_LIBTOOL_TAG_VARS
@@ -733,13 +747,24 @@ _LT_LIBTOOL_TAG_VARS
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -756,8 +781,6 @@ _LT_EOF
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- _LT_PROG_REPLACE_SHELLFNS
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -775,7 +798,6 @@ _LT_EOF
[m4_if([$1], [], [
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'], [])
])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -974,7 +996,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
[lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -992,7 +1014,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
cat conftest.err >&AS_MESSAGE_LOG_FD
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1010,7 +1032,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
[lt_cv_ld_exported_symbols_list=yes],
[lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -1032,7 +1054,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1042,32 +1064,32 @@ _LT_EOF
])
case $host_os in
rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]][[,.]]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1087,29 +1109,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
[FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_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${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed '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${_lt_dar_export_syms}${_lt_dsymutil}"
+[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ _LT_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$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed '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$_lt_dar_export_syms$_lt_dsymutil"
fi
],[])
else
@@ -1129,7 +1151,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
+if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -1147,7 +1169,7 @@ else
_LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi],[])
if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
fi
])
aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1167,8 +1189,8 @@ m4_define([_LT_SHELL_INIT],
# -----------------------
# Find how we can fake an echo command that does not interpret backslash.
# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1196,10 +1218,10 @@ fi
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
- $ECHO "$*"
+ $ECHO "$*"
}
-case "$ECHO" in
+case $ECHO in
printf*) AC_MSG_RESULT([printf]) ;;
print*) AC_MSG_RESULT([print -r]) ;;
*) AC_MSG_RESULT([cat]) ;;
@@ -1225,16 +1247,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
AC_DEFUN([_LT_WITH_SYSROOT],
[AC_MSG_CHECKING([for sysroot])
AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+ [Search for dependent libraries within DIR (or the compiler's sysroot
+ if not specified).])],
[], [with_sysroot=no])
dnl lt_sysroot will always be passed unquoted. We quote it here
dnl in case the user passed a directory name.
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -1244,14 +1267,14 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_RESULT([$with_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])
;;
esac
AC_MSG_RESULT([${lt_sysroot:-no}])
_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
+[dependent libraries, and where our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -1259,31 +1282,33 @@ m4_defun([_LT_ENABLE_LOCK],
[AC_ARG_ENABLE([libtool-lock],
[AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -1312,9 +1337,46 @@ ia64-*-hpux*)
rm -rf conftest*
;;
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1324,7 +1386,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux"
@@ -1369,19 +1438,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_PUSH(C)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1389,7 +1459,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -1398,7 +1468,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -1414,7 +1484,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
])# _LT_ENABLE_LOCK
@@ -1433,11 +1503,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
[echo conftest.$ac_objext > conftest.lst
lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -1445,7 +1515,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
])
])
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -1476,7 +1546,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -1512,7 +1582,7 @@ AC_CACHE_CHECK([$1], [$2],
[$2=no
m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
# 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
@@ -1539,7 +1609,7 @@ AC_CACHE_CHECK([$1], [$2],
$RM conftest*
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$5], , :, [$5])
else
m4_if([$6], , :, [$6])
@@ -1561,7 +1631,7 @@ AC_DEFUN([_LT_LINKER_OPTION],
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $3"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1580,10 +1650,10 @@ AC_CACHE_CHECK([$1], [$2],
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$4], , :, [$4])
else
m4_if([$5], , :, [$5])
@@ -1604,7 +1674,7 @@ AC_DEFUN([LT_CMD_MAX_LEN],
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -1644,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# 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`
@@ -1694,22 +1764,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
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`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# 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"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -1725,7 +1796,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
esac
])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
else
AC_MSG_RESULT(none)
@@ -1753,7 +1824,7 @@ m4_defun([_LT_HEADER_DLFCN],
# ----------------------------------------------------------------
m4_defun([_LT_TRY_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
[$4]
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1800,9 +1871,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -1828,7 +1899,7 @@ int main ()
return status;
}]
_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -1849,7 +1920,7 @@ rm -fr conftest*
# ------------------
AC_DEFUN([LT_SYS_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -1859,44 +1930,52 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
])
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
+ [lt_cv_dlopen=shl_load],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
[AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
+ [lt_cv_dlopen=dlopen],
[AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
[AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
])
])
])
@@ -1905,21 +1984,21 @@ else
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1929,7 +2008,7 @@ else
lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
])
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
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
@@ -1939,9 +2018,9 @@ else
])
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -2033,8 +2112,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS],
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
_LT_COMPILER_C_O([$1])
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
AC_MSG_CHECKING([if we can lock with hard links])
hard_links=yes
@@ -2044,8 +2123,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" !=
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ if test no = "$hard_links"; then
+ AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn
fi
else
@@ -2072,8 +2151,8 @@ objdir=$lt_cv_objdir
_LT_DECL([], [objdir], [0],
[The name of the directory that contains temporary libtool files])dnl
m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+ [Define to the sub-directory where libtool stores uninstalled libraries.])
])# _LT_CHECK_OBJDIR
@@ -2085,15 +2164,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
_LT_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
# We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
# 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_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
# Linking always hardcodes the temporary library directory.
_LT_TAGVAR(hardcode_action, $1)=relink
else
@@ -2107,12 +2186,12 @@ else
fi
AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -2136,7 +2215,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
@@ -2154,6 +2233,47 @@ _LT_DECL([], [striplib], [1])
])# _LT_CMD_STRIPLIB
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x at S|@2 in
+ x)
+ ;;
+ *:)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+ ;;
+ x:*)
+ eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+ ;;
+ *)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
# _LT_SYS_DYNAMIC_LINKER([TAG])
# -----------------------------
# PORTME Fill in your ld.so characteristics
@@ -2164,17 +2284,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -2190,28 +2311,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -2225,7 +2353,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -2234,7 +2362,7 @@ fi])
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -2251,14 +2379,17 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[[4-9]]*)
@@ -2266,41 +2397,91 @@ aix[[4-9]]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a[(]lib.so.V[)]'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -2310,18 +2491,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
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=`func_echo_all "$lib" | $SED '\''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=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $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'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -2329,8 +2510,8 @@ beos*)
bsdi[[45]]*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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 $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2342,7 +2523,7 @@ bsdi[[45]]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -2351,8 +2532,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ 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~
@@ -2368,17 +2549,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
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
dynamic_linker='Win32 ld.exe'
@@ -2387,8 +2568,8 @@ m4_if([$1], [],[
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -2415,7 +2596,7 @@ m4_if([$1], [],[
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -2428,8 +2609,8 @@ m4_if([$1], [],[
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ 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'
@@ -2442,7 +2623,7 @@ m4_if([$1], [],[
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -2455,8 +2636,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2469,8 +2650,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
;;
@@ -2488,12 +2669,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${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'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -2518,26 +2700,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- 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
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -2555,14 +2726,15 @@ hpux9* | hpux10* | hpux11*)
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
+ 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 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -2570,8 +2742,8 @@ hpux9* | hpux10* | hpux11*)
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'
+ 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
;;
@@ -2580,8 +2752,8 @@ hpux9* | hpux10* | hpux11*)
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'
+ 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, ...
@@ -2594,8 +2766,8 @@ interix[[3-9]]*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -2606,7 +2778,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -2614,8 +2786,8 @@ irix5* | irix6* | nonstopux*)
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}'
+ 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=
@@ -2634,8 +2806,8 @@ irix5* | irix6* | nonstopux*)
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}"
+ 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
;;
@@ -2644,13 +2816,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # 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
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -2678,11 +2870,15 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2699,12 +2895,12 @@ netbsd*)
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'
+ 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'
+ 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
shlibpath_var=LD_LIBRARY_PATH
@@ -2714,7 +2910,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ 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
;;
@@ -2723,58 +2919,68 @@ newsos6)
version_type=qnx
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'
+ 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='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ 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
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ 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
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ 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~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
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}'
+ 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"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -2785,8 +2991,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
@@ -2796,11 +3002,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ 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
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -2808,8 +3014,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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)
@@ -2830,24 +3036,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ 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
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
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'
+ 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
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2865,7 +3071,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2873,8 +3079,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -2883,20 +3089,30 @@ uts4*)
;;
esac
AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
_LT_DECL([], [variables_saved_for_relink], [1],
[Variables whose values should be saved in libtool wrapper scripts and
restored at link time])
@@ -2929,39 +3145,41 @@ _LT_DECL([], [hardcode_into_libs], [0],
[Whether we should hardcode library paths into libraries])
_LT_DECL([], [sys_lib_search_path_spec], [2],
[Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+ [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
])# _LT_SYS_DYNAMIC_LINKER
# _LT_PATH_TOOL_PREFIX(TOOL)
# --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
AC_DEFUN([_LT_PATH_TOOL_PREFIX],
[m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="m4_if([$2], , $PATH, [$2])"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -f "$ac_dir/$1"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 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
:
@@ -2984,11 +3202,11 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
AC_MSG_RESULT($MAGIC_CMD)
else
@@ -3006,7 +3224,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
# _LT_PATH_MAGIC
# --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
m4_defun([_LT_PATH_MAGIC],
[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3033,16 +3251,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
+ [test no = "$withval" || with_gnu_ld=yes],
[with_gnu_ld=no])dnl
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3056,7 +3274,7 @@ if test "$GCC" = yes; then
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -3067,37 +3285,37 @@ if test "$GCC" = yes; then
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
AC_MSG_CHECKING([for GNU ld])
else
AC_MSG_CHECKING([for non-GNU ld])
fi
AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ 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 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'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
AC_MSG_RESULT($LD)
else
@@ -3151,13 +3369,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3168,6 +3386,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+ [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
# _LT_CHECK_MAGIC_METHOD
# ----------------------
# how to check for library dependencies
@@ -3183,13 +3438,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[[4-9]]*)
@@ -3216,8 +3471,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -3253,10 +3507,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3295,7 +3545,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3317,8 +3567,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3371,6 +3621,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
])
@@ -3411,33 +3664,38 @@ AC_DEFUN([LT_PATH_NM],
AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
[if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ 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
+ 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"
+ 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
+ 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:
+ # 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'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3448,21 +3706,21 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
# Let the user override the test.
else
AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -3470,8 +3728,8 @@ else
esac
fi
AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -3517,8 +3775,8 @@ lt_cv_sharedlib_from_linklib_cmd,
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -3530,7 +3788,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
])
@@ -3557,13 +3815,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool
lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
])# _LT_PATH_MANIFEST_TOOL
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+ test DEF = "`$SED -n dnl
+ -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
+ -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
+ -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
+ -e q dnl Only consider the first "real" line
+ $1`" dnl
+])# _LT_DLL_DEF_P
+
+
# LT_LIB_M
# --------
# check for math library
@@ -3575,11 +3848,11 @@ case $host in
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
;;
*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
+ AC_CHECK_LIB(m, cos, LIBM=-lm)
;;
esac
AC_SUBST([LIBM])
@@ -3598,7 +3871,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -3650,7 +3923,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[[ABCDEGRST]]'
fi
;;
@@ -3683,14 +3956,44 @@ case `$NM -V 2>&1` in
symcode='[[ABCDGIRSTW]]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-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_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3708,21 +4011,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx]"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -3762,11 +4068,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT@&t at _DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT@&t at _DLSYM_CONST
#else
@@ -3792,7 +4098,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -3812,9 +4118,9 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -3835,7 +4141,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -3862,12 +4168,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
[Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+ [Transform the output of nm into a list of symbols to manually relocate])
_LT_DECL([global_symbol_to_c_name_address],
[lt_cv_sys_global_symbol_to_c_name_address], [1],
[Transform the output of nm in a C name address pair])
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+ [The name lister interface])
_LT_DECL([], [nm_file_list_spec], [1],
[Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3883,17 +4193,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)=
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -3904,8 +4215,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -3921,6 +4232,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -3970,7 +4286,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4011,14 +4327,14 @@ m4_if([$1], [CXX], [
case $cc_basename in
CC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -4047,7 +4363,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4055,7 +4371,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4200,17 +4516,18 @@ m4_if([$1], [CXX], [
fi
],
[
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -4221,8 +4538,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -4239,6 +4556,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4309,7 +4631,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4317,11 +4639,30 @@ m4_if([$1], [CXX], [
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -4337,7 +4678,7 @@ m4_if([$1], [CXX], [
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -4346,9 +4687,9 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4373,6 +4714,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -4470,7 +4817,7 @@ m4_if([$1], [CXX], [
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -4499,7 +4846,7 @@ m4_if([$1], [CXX], [
fi
])
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -4565,17 +4912,21 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_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'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -4621,9 +4972,9 @@ m4_if([$1], [CXX], [
# included in the symbol list
_LT_TAGVAR(include_expsyms, $1)=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
_LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -4639,7 +4990,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -4647,7 +4998,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
esac
@@ -4657,7 +5008,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -4679,24 +5030,24 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ 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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_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_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -4709,7 +5060,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
case $host_os in
aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -4728,7 +5079,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -4744,7 +5095,7 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4754,7 +5105,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4762,61 +5113,89 @@ _LT_EOF
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_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_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_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, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $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_TAGVAR(ld_shlibs, $1)=no
fi
;;
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_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_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_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'
+ _LT_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_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'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4827,42 +5206,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_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~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4876,8 +5260,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -4895,8 +5279,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4908,7 +5292,7 @@ _LT_EOF
_LT_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
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** 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
@@ -4923,9 +5307,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_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_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4942,15 +5326,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
esac
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
runpath_var=
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4966,7 +5350,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4974,34 +5358,57 @@ _LT_EOF
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_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'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -5020,13 +5427,21 @@ _LT_EOF
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
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`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -5045,61 +5460,80 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_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"
+ _LT_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_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_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'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -5108,7 +5542,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -5138,16 +5572,17 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5156,18 +5591,18 @@ _LT_EOF
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -5176,7 +5611,7 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -5226,33 +5661,33 @@ _LT_EOF
;;
hpux9*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- _LT_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'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5260,25 +5695,25 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
m4_if($1, [], [
@@ -5286,14 +5721,14 @@ _LT_EOF
# (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
_LT_LINKER_OPTION([if $CC understands -b],
_LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
[_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ [_LT_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
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -5304,7 +5739,7 @@ _LT_EOF
*)
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_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.
@@ -5315,16 +5750,16 @@ _LT_EOF
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
# This should be the same for all languages, so no per-tag cache variable.
AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
[lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ [save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
AC_LINK_IFELSE(
[AC_LANG_SOURCE(
[AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
@@ -5337,21 +5772,31 @@ _LT_EOF
end]])])],
[lt_cv_irix_exported_symbol=yes],
[lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ LDFLAGS=$save_LDFLAGS])
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -5366,7 +5811,7 @@ _LT_EOF
newsos6)
_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -5374,27 +5819,19 @@ _LT_EOF
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
fi
else
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5405,33 +5842,53 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_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_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5442,24 +5899,24 @@ _LT_EOF
solaris*)
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_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'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_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} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -5469,11 +5926,11 @@ _LT_EOF
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
fi
@@ -5483,10 +5940,10 @@ _LT_EOF
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -5535,43 +5992,43 @@ _LT_EOF
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT 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_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -5586,17 +6043,17 @@ _LT_EOF
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
;;
esac
fi
fi
])
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
@@ -5613,7 +6070,7 @@ x|xyes)
# Assume -lc should be added
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $_LT_TAGVAR(archive_cmds, $1) in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -5693,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary])
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ "absolute", i.e impossible to change by setting $shlibpath_var if the
library is relocated])
_LT_TAGDECL([], [hardcode_minus_L], [0],
[Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5739,10 +6196,10 @@ dnl [Compiler flag to generate thread safe objects])
# ------------------------
# Ensure that the configuration variables for a C compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_C_CONFIG],
[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
AC_LANG_PUSH(C)
# Source file extension for C test sources.
@@ -5782,18 +6239,18 @@ if test -n "$compiler"; then
LT_SYS_DLOPEN_SELF
_LT_CMD_STRIPLIB
- # Report which library types will actually be built
+ # Report what library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -5801,8 +6258,12 @@ if test -n "$compiler"; then
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -5810,13 +6271,13 @@ if test -n "$compiler"; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
_LT_CONFIG($1)
fi
AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
])# _LT_LANG_C_CONFIG
@@ -5824,14 +6285,14 @@ CC="$lt_save_CC"
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
AC_PROG_CXXCPP
else
_lt_caught_CXX_error=yes
@@ -5873,7 +6334,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -5915,35 +6376,35 @@ if test "$_lt_caught_CXX_error" != yes; then
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
else
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
LT_PATH_LD
# 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_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
@@ -5979,18 +6440,30 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
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.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -6000,6 +6473,13 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -6018,13 +6498,21 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
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`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -6042,64 +6530,84 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
- _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_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"
+ _LT_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_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- _LT_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'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -6109,7 +6617,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6137,57 +6645,58 @@ if test "$_lt_caught_CXX_error" != yes; then
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_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_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $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'
+ _LT_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, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $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_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6198,6 +6707,34 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_DARWIN_LINKER_FEATURES($1)
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -6232,18 +6769,15 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
# but as the default
@@ -6255,7 +6789,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aCC*)
- _LT_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'
+ _LT_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 "x$output_objdir/$soname" = "x$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.
@@ -6264,11 +6798,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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; func_echo_all "$list"'
+ 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; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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'
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6278,15 +6812,15 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
esac
fi
@@ -6312,13 +6846,13 @@ if test "$_lt_caught_CXX_error" != yes; then
aCC*)
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_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'
+ _LT_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
@@ -6329,20 +6863,20 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$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; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -6357,22 +6891,22 @@ if test "$_lt_caught_CXX_error" != yes; then
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_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_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_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'
+ _LT_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_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*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-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
@@ -6381,22 +6915,22 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6404,8 +6938,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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_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_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'
+ _LT_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_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.
@@ -6414,10 +6948,10 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6431,59 +6965,59 @@ if test "$_lt_caught_CXX_error" != yes; then
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_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_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_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'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6497,18 +7031,18 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
_LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -6516,10 +7050,10 @@ if test "$_lt_caught_CXX_error" != yes; then
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
@@ -6577,22 +7111,17 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_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_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_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ _LT_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_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -6608,9 +7137,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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_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_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Archives containing C++ object files must be created using
@@ -6628,17 +7157,17 @@ if test "$_lt_caught_CXX_error" != yes; then
cxx*)
case $host in
osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_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 $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'
+ echo "-hidden">> $lib.exp~
+ $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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
esac
@@ -6653,21 +7182,21 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- _LT_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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_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" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Commands to make compiler produce verbose output that lists
@@ -6713,9 +7242,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_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} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6723,7 +7252,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
@@ -6740,30 +7269,30 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
gcx*)
# Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_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_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
@@ -6771,11 +7300,11 @@ if test "$_lt_caught_CXX_error" != yes; then
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -6784,52 +7313,52 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_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
+ # Note: We CANNOT 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_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
_LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -6860,10 +7389,10 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$GXX
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6890,7 +7419,7 @@ if test "$_lt_caught_CXX_error" != yes; then
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -6912,13 +7441,14 @@ AC_REQUIRE([_LT_DECL_SED])
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case @S|@2 in
+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
esac
} # func_stripname_cnf
])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -7002,13 +7532,13 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -7024,16 +7554,16 @@ if AC_TRY_EVAL(ac_compile); then
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
else
- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -7041,9 +7571,9 @@ if AC_TRY_EVAL(ac_compile); then
esac
else
if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)=$prev$p
else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
fi
fi
prev=
@@ -7058,15 +7588,15 @@ if AC_TRY_EVAL(ac_compile); then
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
+ _LT_TAGVAR(predep_objects, $1)=$p
else
_LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
fi
else
if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
+ _LT_TAGVAR(postdep_objects, $1)=$p
else
_LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
fi
@@ -7097,51 +7627,6 @@ interix[[3-9]]*)
_LT_TAGVAR(postdep_objects,$1)=
_LT_TAGVAR(postdeps,$1)=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # 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.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
])
@@ -7150,7 +7635,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in
esac
_LT_TAGVAR(compiler_lib_search_dirs, $1)=
if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
[The directories searched by this compiler when creating a shared library])
@@ -7170,10 +7655,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
+if test -z "$F77" || test no = "$F77"; then
_lt_disable_F77=yes
fi
@@ -7210,7 +7695,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the F77 compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7232,7 +7717,7 @@ if test "$_lt_disable_F77" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
@@ -7246,21 +7731,25 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7268,11 +7757,11 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$G77
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7289,9 +7778,9 @@ if test "$_lt_disable_F77" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
@@ -7301,11 +7790,11 @@ AC_LANG_POP
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
[AC_LANG_PUSH(Fortran)
-if test -z "$FC" || test "X$FC" = "Xno"; then
+if test -z "$FC" || test no = "$FC"; then
_lt_disable_FC=yes
fi
@@ -7342,7 +7831,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the FC compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7364,7 +7853,7 @@ if test "$_lt_disable_FC" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
@@ -7380,21 +7869,25 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7402,11 +7895,11 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7426,7 +7919,7 @@ if test "$_lt_disable_FC" != yes; then
GCC=$lt_save_GCC
CC=$lt_save_CC
CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
AC_LANG_POP
])# _LT_LANG_FC_CONFIG
@@ -7436,7 +7929,7 @@ AC_LANG_POP
# --------------------------
# Ensure that the configuration variables for the GNU Java Compiler compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GCJ_CONFIG],
[AC_REQUIRE([LT_PROG_GCJ])dnl
AC_LANG_SAVE
@@ -7470,7 +7963,7 @@ CC=${GCJ-"gcj"}
CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7507,7 +8000,7 @@ CFLAGS=$lt_save_CFLAGS
# --------------------------
# Ensure that the configuration variables for the GNU Go compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GO_CONFIG],
[AC_REQUIRE([LT_PROG_GO])dnl
AC_LANG_SAVE
@@ -7541,7 +8034,7 @@ CC=${GOC-"gccgo"}
CFLAGS=$GOFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# Go did not exist at the time GCC didn't implicitly link libc in.
@@ -7578,7 +8071,7 @@ CFLAGS=$lt_save_CFLAGS
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_RC_CONFIG],
[AC_REQUIRE([LT_PROG_RC])dnl
AC_LANG_SAVE
@@ -7594,7 +8087,7 @@ _LT_TAGVAR(objext, $1)=$objext
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_TAG_COMPILER
@@ -7604,7 +8097,7 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
@@ -7633,7 +8126,7 @@ AC_DEFUN([LT_PROG_GCJ],
[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
AC_SUBST(GCJFLAGS)])])[]dnl
])
@@ -7744,7 +8237,7 @@ lt_ac_count=0
# 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 && continue
+ test ! -f "$lt_ac_sed" && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7761,9 +8254,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
$lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
cmp -s conftest.out conftest.nl || break
# 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
+ test 10 -lt "$lt_ac_count" && break
lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
lt_ac_max=$lt_ac_count
lt_cv_path_SED=$lt_ac_sed
fi
@@ -7787,27 +8280,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], [])
# Find out whether the shell is Bourne or XSI compatible,
# or has some other useful features.
m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
lt_unset=false
@@ -7831,102 +8304,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
# _LT_PATH_CONVERSION_FUNCTIONS
# -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what file name conversion functions should be used by
# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
# for certain cross-compile configurations and native mingw.
m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 5d9acd8..94b0829 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,14 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# 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 7 ltoptions.m4
+# serial 8 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
+ [m4_warning([Unknown $1 option '$2'])])[]dnl
])
@@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
+ [_LT_ENABLE_FAST_INSTALL])
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
# _LT_WITH_PIC([MODE])
# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC],
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+ [pic_mode=m4_default([$1], [default])])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
@@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a05..48bc934 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 07a8602..fa04b52 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da9..c6b26f8 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
@@ -25,7 +26,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
diff --git a/nautilus-extension/nautilus-easytag.c b/nautilus-extension/nautilus-easytag.c
index 71620da..32cd145 100644
--- a/nautilus-extension/nautilus-easytag.c
+++ b/nautilus-extension/nautilus-easytag.c
@@ -154,7 +154,7 @@ static void
on_open_with_easytag (NautilusMenuItem *item,
gpointer data)
{
- GList *files, *scan;
+ GList *files;
GDesktopAppInfo *appinfo;
files = g_object_get_data (G_OBJECT (item), "files");
diff --git a/po/cs.po b/po/cs.po
index 1efffa0..9dfec26 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,15 +3,15 @@
#
# Milan Siebenburger <milan.siebenburger at ais.cz>, 2002, 2003, 2004.
# Zbynek Mrkvicka <zbynek at mrkvicka.eu>, 2005, 2006, 2007
-# Marek Černocký <marek at manet.cz>, 2013, 2014.
+# Marek Černocký <marek at manet.cz>, 2013, 2014, 2015.
#
msgid ""
msgstr ""
"Project-Id-Version: EasyTAG 2.1.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-12-26 04:16+0000\n"
-"PO-Revision-Date: 2014-12-26 12:08+0100\n"
+"POT-Creation-Date: 2015-03-01 16:16+0000\n"
+"PO-Revision-Date: 2015-03-01 19:30+0100\n"
"Last-Translator: Marek Černocký <marek at manet.cz>\n"
"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
"Language: cs\n"
@@ -92,16 +92,16 @@ msgstr ""
"Napište název programu, který se má spustit. Tomuto programu se předá "
"aktuální složka jako parametr."
-#: ../data/browser.ui.h:4 ../src/browser.c:3773 ../src/tag_area.c:1479
+#: ../data/browser.ui.h:4 ../src/browser.c:3783 ../src/tag_area.c:1518
msgid "_Open"
msgstr "_Otevřít"
#: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
-#: ../src/application_window.c:323 ../src/application_window.c:337
-#: ../src/application_window.c:2685 ../src/application_window.c:2723
-#: ../src/browser.c:863 ../src/browser.c:3772 ../src/cddb_dialog.c:2297
-#: ../src/easytag.c:467 ../src/easytag.c:474 ../src/easytag.c:599
-#: ../src/playlist_dialog.c:658 ../src/tag_area.c:1477 ../src/tag_area.c:1840
+#: ../src/application_window.c:343 ../src/application_window.c:357
+#: ../src/application_window.c:2992 ../src/application_window.c:3030
+#: ../src/browser.c:863 ../src/browser.c:3782 ../src/cddb_dialog.c:2306
+#: ../src/easytag.c:475 ../src/easytag.c:482 ../src/easytag.c:607
+#: ../src/playlist_dialog.c:669 ../src/tag_area.c:1516 ../src/tag_area.c:1868
msgid "_Cancel"
msgstr "_Zrušit"
@@ -121,7 +121,7 @@ msgstr ""
"aktuální soubory jako parametr."
#. Only directories changed
-#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:565
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:573
msgid "Rename Directory"
msgstr "Přejmenování složky"
@@ -157,11 +157,11 @@ msgstr "_Přejmenovat"
msgid "Choose a directory to show in the browser"
msgstr "Zadejte název složky, kterou chcete procházet"
-#: ../data/browser.ui.h:17 ../src/application.c:129
+#: ../data/browser.ui.h:17 ../src/application.c:130
msgid "Select a directory to browse"
msgstr "Vyberte složku, kterou chcete procházet"
-#: ../data/browser.ui.h:18 ../src/easytag.c:1071
+#: ../data/browser.ui.h:18 ../src/easytag.c:1080
msgid "No files"
msgstr "žádný soubor"
@@ -228,7 +228,7 @@ msgstr "Poznámka"
#: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71
#: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
-#: ../src/picture.c:212
+#: ../src/picture.c:214
msgid "Composer"
msgstr "Skladatel"
@@ -295,7 +295,7 @@ msgid "Track Name"
msgstr "Název skladby"
#: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91
-#: ../src/picture.c:190
+#: ../src/picture.c:192
msgid "Other"
msgstr "Další"
@@ -418,13 +418,13 @@ msgid "Whether to use the DLM algorithm to match CDDB results to files"
msgstr "Zda pro srovnání výsledků CDDB vůči souborům použít algoritmus DLM"
#: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
-#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:291
-#: ../src/scan_dialog.c:2261
+#: ../src/load_files_dialog.c:900 ../src/preferences_dialog.c:291
+#: ../src/scan_dialog.c:2307
msgid "_Close"
msgstr "_Zavřít"
-#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2298
-#: ../src/load_files_dialog.c:896
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2307
+#: ../src/load_files_dialog.c:901
msgid "_Apply"
msgstr "_Použít"
@@ -433,7 +433,8 @@ msgid "Load the selected lines or all lines (if no lines are selected)"
msgstr "Načíst vybrané řádky nebo všechny řádky (pokud nejsou žádné vybrány)"
#. Default values are MPEG data.
-#: ../data/file_area.ui.h:1 ../src/et_core.c:3010 ../src/file_area.c:192
+#: ../data/file_area.ui.h:1 ../src/application_window.c:2186
+#: ../src/file_area.c:196
msgid "File"
msgstr "Soubor"
@@ -444,10 +445,10 @@ msgstr "0/0:"
#. Nothing to display
#. Version changed to encoder version
#. Encoder version
-#: ../data/file_area.ui.h:3 ../src/file_area.c:193
-#: ../src/tags/flac_header.c:175 ../src/tags/monkeyaudio_header.c:88
-#: ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:398
-#: ../src/tags/opus_header.c:223 ../src/tags/wavpack_header.c:141
+#: ../data/file_area.ui.h:3 ../src/file_area.c:197
+#: ../src/tags/flac_header.c:168 ../src/tags/monkeyaudio_header.c:88
+#: ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:399
+#: ../src/tags/opus_header.c:226 ../src/tags/wavpack_header.c:141
msgid "Encoder:"
msgstr "Kodér:"
@@ -460,8 +461,8 @@ msgid "Sample rate:"
msgstr "Vzorkování:"
#. Mode
-#: ../data/file_area.ui.h:6 ../src/file_area.c:197
-#: ../src/tags/mpeg_header.c:247
+#: ../data/file_area.ui.h:6 ../src/file_area.c:201
+#: ../src/tags/mpeg_header.c:260
msgid "Mode:"
msgstr "Režim:"
@@ -501,8 +502,8 @@ msgstr "Vložit prázdný řádek před vybraný řádek"
msgid "Delete the selected line"
msgstr "Smazat vybraný řádek"
-#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:636
-#: ../src/load_files_dialog.c:739
+#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:641
+#: ../src/load_files_dialog.c:744
msgid "Delete all blank lines"
msgstr "Smazat všechny prázdné řádky"
@@ -514,8 +515,8 @@ msgstr "Posunout vybraný řádek výš"
msgid "Move the selected line down"
msgstr "Posunout vybraný řádek níž"
-#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:654
-#: ../src/load_files_dialog.c:757
+#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:659
+#: ../src/load_files_dialog.c:762
msgid "Reload"
msgstr "Znovu načíst"
@@ -541,7 +542,7 @@ msgstr "_Nápověda"
msgid "_About"
msgstr "O _aplikaci"
-#: ../data/menus.ui.h:3 ../src/application_window.c:2724
+#: ../data/menus.ui.h:3 ../src/application_window.c:3031
msgid "_Quit"
msgstr "U_končit"
@@ -1905,8 +1906,8 @@ msgstr "%o: původní umělec"
#: ../data/scan_dialog.ui.h:37
#, no-c-format
-msgid "%n: track"
-msgstr "%n: skladba"
+msgid "%n: track number"
+msgstr "%n: číslo skladby"
#: ../data/scan_dialog.ui.h:39
#, no-c-format
@@ -1953,7 +1954,7 @@ msgid "Rename file preview"
msgstr "Náhled přejmenování souboru"
#. Only filename changed
-#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:574
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:582
msgid "Rename File"
msgstr "Přejmenování souboru"
@@ -2075,7 +2076,7 @@ msgid "Spaces Conversions"
msgstr "Převody mezer"
#: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153
-#: ../src/tag_area.c:876
+#: ../src/tag_area.c:906
msgid "Remove spaces"
msgstr "Odstranit mezery"
@@ -2109,7 +2110,7 @@ msgstr "Neměnit oddělovače slov"
msgid "Character Conversions"
msgstr "Převody znaků"
-#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:832
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:862
#, no-c-format
msgid "Convert ‘_’ and ‘%20’ to spaces"
msgstr "Převést „_“ a „%20“ na mezery"
@@ -2123,7 +2124,7 @@ msgstr ""
"Podtržítka nebo řetězec „%20“ budou nahrazovány jednou mezerou. Příklad "
"před: „Text%20v%20nějaké_položce“ a po: „Text v nějaké položce“"
-#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:838
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:868
msgid "Convert spaces to underscores"
msgstr "Převést mezery na podržítka"
@@ -2207,7 +2208,7 @@ msgstr "CD"
msgid "Image Type"
msgstr "Typ obrázku"
-#: ../data/tag_area.ui.h:2 ../src/picture.c:272
+#: ../data/tag_area.ui.h:2 ../src/picture.c:269
msgid "Description"
msgstr "Popis"
@@ -2215,7 +2216,7 @@ msgstr "Popis"
msgid "_Accept"
msgstr "_Přijmout"
-#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3019
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3051
msgid "Tag"
msgstr "Štítek"
@@ -2367,7 +2368,7 @@ msgstr "Upravit vlastnosti obrázku"
msgid "Tag selected files with these images"
msgstr "Nastavit vybraným souborům tyto obrázky"
-#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3272 ../src/tag_area.c:3275
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3304 ../src/tag_area.c:3307
msgid "Images"
msgstr "Obrázky"
@@ -2443,7 +2444,7 @@ msgstr "Hledat názvy souborů a štítků"
msgid "CDDB Search…"
msgstr "Hledat v CDDB…"
-#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2746
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2756
msgid "CDDB Search"
msgstr "Hledání v CDDB"
@@ -3091,137 +3092,184 @@ msgstr "Marek Černocký <marek at manet.cz>"
msgid "View and edit tags in audio files"
msgstr "Zobrazování a úpravy štítků ve zvukových souborech"
-#: ../src/application.c:46
+#: ../src/application.c:47
msgid "Print the version and exit"
msgstr "Vypsat verzi a skončit"
#. Starting messages
-#: ../src/application.c:176
+#: ../src/application.c:177
#, c-format
msgid "Starting EasyTAG version %s…"
msgstr "Spouští se EasyTAG verze %s…"
-#: ../src/application.c:181
+#: ../src/application.c:182
#, c-format
msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
msgstr "Je definována proměnná EASYTAGLANG. Nastaví se národní prostředí: „%s“"
-#: ../src/application.c:186
+#: ../src/application.c:187
#, c-format
msgid "Setting locale: ‘%s’"
msgstr "Nastavuje se národní prostředí: „%s“"
-#: ../src/application.c:192
+#: ../src/application.c:193
#, c-format
msgid "System locale is ‘%s’, using ‘%s’"
msgstr "Národní prostředí systému je „%s“, používá se „%s“"
-#: ../src/application.c:197
+#: ../src/application.c:198
msgid "Unable to create setting directories"
msgstr "Nelze vytvořit složky s nastavením"
-#: ../src/application.c:338
+#: ../src/application.c:339
#, c-format
msgid "Website: %s"
msgstr "Webové stránky: %s"
-#: ../src/application.c:347
+#: ../src/application.c:348
msgid "- Tag and rename audio files"
msgstr "– upravovat štítky a názvy zvukových souborů"
-#: ../src/application.c:431 ../src/et_core.c:641
+#: ../src/application.c:432 ../src/file_list.c:402
#, c-format
msgid "Error while querying information for file ‘%s’: %s"
msgstr "Chyba při dotazování na informace o souboru „%s“: %s"
-#: ../src/application.c:495
+#: ../src/application.c:495 ../src/application.c:503
#, c-format
msgid "Cannot open path ‘%s’"
msgstr "Nelze otevřít cestu „%s“"
-#: ../src/application_window.c:317 ../src/application_window.c:334
+#: ../src/application_window.c:337 ../src/application_window.c:354
#, c-format
msgid "Do you really want to delete the file ‘%s’?"
msgstr "Opravdu chcete smazat soubor „%s“?"
-#: ../src/application_window.c:320 ../src/easytag.c:462 ../src/easytag.c:595
+#: ../src/application_window.c:340 ../src/easytag.c:470 ../src/easytag.c:603
msgid "Repeat action for the remaining files"
msgstr "Opakovat akci pro zbytek souborů"
-#: ../src/application_window.c:322
+#: ../src/application_window.c:342
msgid "_Skip"
msgstr "Pře_skočit"
-#: ../src/application_window.c:324 ../src/application_window.c:338
+#: ../src/application_window.c:344 ../src/application_window.c:358
msgid "_Delete"
msgstr "_Smazat"
-#: ../src/application_window.c:326 ../src/application_window.c:336
+#: ../src/application_window.c:346 ../src/application_window.c:356
msgid "Delete File"
msgstr "Vymazání souboru"
-#: ../src/application_window.c:363
+#: ../src/application_window.c:383
#, c-format
msgid "File ‘%s’ deleted"
msgstr "Soubor „%s“ byl vymazán"
-#: ../src/application_window.c:540
+#: ../src/application_window.c:558
#, c-format
msgid "Cannot delete file ‘%s’"
msgstr "Nelze smazat soubor „%s“"
-#: ../src/application_window.c:561
+#: ../src/application_window.c:582
msgid "Some files were not deleted"
msgstr "Některé soubory nebyly smazány"
-#: ../src/application_window.c:563
+#: ../src/application_window.c:584
msgid "All files have been deleted"
msgstr "Všechny soubory byly smazány"
-#: ../src/application_window.c:902
+#: ../src/application_window.c:913
msgid "All tags have been removed"
msgstr "Všechny štítky byly odmazány"
-#: ../src/application_window.c:1506 ../src/browser.c:355 ../src/browser.c:398
-#: ../src/browser.c:432 ../src/browser.c:4710 ../src/browser.c:4785
+#: ../src/application_window.c:1472 ../src/browser.c:349 ../src/browser.c:392
+#: ../src/browser.c:426 ../src/browser.c:4724 ../src/browser.c:4799
#, c-format
msgid "Failed to launch program ‘%s’"
msgstr "Selhalo spuštění programu: %s"
+#: ../src/application_window.c:2012
+#, c-format
+msgid "Could not convert filename ‘%s’ to system filename encoding"
+msgstr "Nelze převést název souboru „%s“ do systémového kódování názvů soborů"
+
+#: ../src/application_window.c:2015
+msgid "Try setting the environment variable G_FILENAME_ENCODING."
+msgstr "Zkuste nastavit proměnnou prostředí G_FILENAME_ENCODING"
+
+#: ../src/application_window.c:2017 ../src/scan_dialog.c:813
+msgid "Filename translation"
+msgstr "Překlad názvu souboru"
+
+#. And refresh the number of files in this directory
+#: ../src/application_window.c:2160
+#, c-format
+msgid "One file"
+msgid_plural "%u files"
+msgstr[0] "jeden soubor"
+msgstr[1] "%u soubory"
+msgstr[2] "%u souborů"
+
+#. Bitrate
+#: ../src/application_window.c:2193 ../src/tags/flac_header.c:172
+#: ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:252 ../src/tags/musepack_header.c:86
+#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:230
+#: ../src/tags/wavpack_header.c:145
+#, c-format
+msgid "%d kb/s"
+msgstr "%d kb/s"
+
+#. Samplerate
+#: ../src/application_window.c:2196 ../src/tags/flac_header.c:175
+#: ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148
+#: ../src/tags/mpeg_header.c:257 ../src/tags/musepack_header.c:89
+#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:233
+#: ../src/tags/wavpack_header.c:148
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
+
+#: ../src/application_window.c:2329 ../src/easytag.c:1010
+#, c-format
+msgid "File: ‘%s’"
+msgstr "Soubor: „%s“"
+
#. Quit EasyTAG.
-#: ../src/application_window.c:2646
+#: ../src/application_window.c:2956
msgid "Normal exit"
msgstr "Standardní ukončení"
-#: ../src/application_window.c:2683 ../src/browser.c:858
+#: ../src/application_window.c:2990 ../src/browser.c:858
msgid "Some files have been modified but not saved"
msgstr "Některé soubory byly změněny, ale neuloženy"
-#: ../src/application_window.c:2684 ../src/browser.c:862 ../src/easytag.c:247
-#: ../src/easytag.c:466 ../src/easytag.c:598 ../src/easytag.c:606
+#: ../src/application_window.c:2991 ../src/browser.c:862 ../src/easytag.c:254
+#: ../src/easytag.c:474 ../src/easytag.c:606 ../src/easytag.c:614
msgid "_Discard"
msgstr "Zaho_dit"
-#: ../src/application_window.c:2686 ../src/browser.c:864 ../src/easytag.c:248
-#: ../src/easytag.c:468 ../src/easytag.c:475 ../src/easytag.c:600
-#: ../src/easytag.c:607 ../src/playlist_dialog.c:659 ../src/tag_area.c:1842
+#: ../src/application_window.c:2993 ../src/browser.c:864 ../src/easytag.c:255
+#: ../src/easytag.c:476 ../src/easytag.c:483 ../src/easytag.c:608
+#: ../src/easytag.c:615 ../src/playlist_dialog.c:670 ../src/tag_area.c:1870
msgid "_Save"
msgstr "_Uložit"
-#: ../src/application_window.c:2690 ../src/application_window.c:2728
-#: ../src/easytag.c:253
+#: ../src/application_window.c:2997 ../src/application_window.c:3035
+#: ../src/easytag.c:260
msgid "Quit"
msgstr "Ukončit"
-#: ../src/application_window.c:2693
+#: ../src/application_window.c:3000
msgid "Do you want to save them before quitting?"
msgstr "Chcete je uložit, než skončíte?"
-#: ../src/application_window.c:2722
+#: ../src/application_window.c:3029
msgid "Do you really want to quit?"
msgstr "Opravdu chcete skončit?"
-#: ../src/browser.c:568
+#: ../src/browser.c:562
msgid "New default directory selected for browser"
msgstr "Nová výchozí složka vybraná pro prohlížeč"
@@ -3233,63 +3281,63 @@ msgstr "Chcete je před tím, než se změní složka, uložit?"
msgid "Confirm Directory Change"
msgstr "Potvrzení změny složky"
-#: ../src/browser.c:2556
+#: ../src/browser.c:2563
msgid "All albums"
msgstr "Všechna alba"
-#: ../src/browser.c:3809
+#: ../src/browser.c:3819
msgid "Select File"
msgstr "Výběr souboru"
-#: ../src/browser.c:3816
+#: ../src/browser.c:3826
msgid "Select Directory"
msgstr "Výběr složky"
-#: ../src/browser.c:4199
+#: ../src/browser.c:4209
#, c-format
msgid "Rename the directory ‘%s’ to:"
msgstr "Přejmenovat složku „%s“ na:"
-#: ../src/browser.c:4339
+#: ../src/browser.c:4349
msgid "You must type a directory name"
msgstr "Musíte vyplnit název složky"
-#: ../src/browser.c:4340 ../src/browser.c:4362
+#: ../src/browser.c:4350 ../src/browser.c:4372
msgid "Directory Name Error"
msgstr "Chyba v názvu složky"
-#: ../src/browser.c:4358
+#: ../src/browser.c:4368
#, c-format
msgid "Could not convert ‘%s’ into filename encoding"
msgstr "Nelze převést „%s“ do kódování názvů souborů"
-#: ../src/browser.c:4361
+#: ../src/browser.c:4371
msgid "Please use another name."
msgstr "Použijte prosím jiný název."
-#: ../src/browser.c:4433
+#: ../src/browser.c:4443
#, c-format
msgid "The directory name ‘%s’ already exists."
msgstr "Složka s názvem „%s“ již existuje."
-#: ../src/browser.c:4434 ../src/easytag.c:655
+#: ../src/browser.c:4444 ../src/easytag.c:661
msgid "Rename File Error"
msgstr "Chyba při přejmenování souboru"
-#: ../src/browser.c:4472 ../src/browser.c:4501
+#: ../src/browser.c:4482 ../src/browser.c:4511
msgid "Rename Directory Error"
msgstr "Chyba při přejmenování složky"
-#: ../src/browser.c:4540
+#: ../src/browser.c:4552
msgid "Directory renamed"
msgstr "Složka přejmenována"
-#: ../src/browser.c:4702 ../src/browser.c:4777
+#: ../src/browser.c:4716 ../src/browser.c:4791
#, c-format
msgid "Executed command ‘%s’"
msgstr "Proveden příkaz „%s“"
-#: ../src/cddb_dialog.c:270
+#: ../src/cddb_dialog.c:271
#, c-format
msgid ""
"Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: "
@@ -3297,57 +3345,57 @@ msgid ""
msgstr ""
"Album: „%s“, umělec: „%s“, délka: „%s“, rok: „%s“, žánr: „%s“, ID disku: „%s“"
-#: ../src/cddb_dialog.c:586
+#: ../src/cddb_dialog.c:587
#, c-format
msgid "Resolving host '%s'…"
msgstr "Hledá se server „%s“…"
-#: ../src/cddb_dialog.c:628
+#: ../src/cddb_dialog.c:629
#, c-format
msgid "Cannot create a new socket ‘%s’"
msgstr "Nelze vytvořit nový soket: %s"
-#: ../src/cddb_dialog.c:642
+#: ../src/cddb_dialog.c:643
msgid "Cannot set options on the newly-created socket"
msgstr "Nelze upravit nastavení nově vytvořeného soketu"
#. Open connection to the server.
-#: ../src/cddb_dialog.c:646
+#: ../src/cddb_dialog.c:647
#, c-format
msgid "Connecting to host ‘%s’, port ‘%d’…"
msgstr "Probíhá připojování k serveru „%s“, port „%d“…"
-#: ../src/cddb_dialog.c:659
+#: ../src/cddb_dialog.c:660
#, c-format
msgid "Cannot connect to host ‘%s’: %s"
msgstr "Nelze se připojit k serveru „%s“: %s"
-#: ../src/cddb_dialog.c:683
+#: ../src/cddb_dialog.c:684
#, c-format
msgid "Cannot resolve host ‘%s’: %s"
msgstr "Nezdařilo se najít server „%s“: %s"
-#: ../src/cddb_dialog.c:696
+#: ../src/cddb_dialog.c:697
#, c-format
msgid "Connected to host ‘%s’"
msgstr "Připojeno k serveru „%s“"
-#: ../src/cddb_dialog.c:783
+#: ../src/cddb_dialog.c:784
#, c-format
msgid "Error while writing CDDB results to file ‘%s’"
msgstr "Chyba při zápisu výsledků CDDB do souboru „%s“"
-#: ../src/cddb_dialog.c:794
+#: ../src/cddb_dialog.c:795
#, c-format
msgid "Receiving data (%s)…"
msgstr "Přijímají se data (%s)…"
-#: ../src/cddb_dialog.c:807
+#: ../src/cddb_dialog.c:808
#, c-format
msgid "Error when reading CDDB response ‘%s’"
msgstr "Chyba při čtení odpovědi od CDDB „%s“"
-#: ../src/cddb_dialog.c:814
+#: ../src/cddb_dialog.c:815
#, c-format
msgid "Cannot create file ‘%s’: %s"
msgstr "Nelze vytvořit soubor „%s“: %s"
@@ -3358,13 +3406,13 @@ msgstr "Nelze vytvořit soubor „%s“: %s"
#. Send the request
#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
#. Send the request
-#: ../src/cddb_dialog.c:943 ../src/cddb_dialog.c:1589
-#: ../src/cddb_dialog.c:1927
+#: ../src/cddb_dialog.c:948 ../src/cddb_dialog.c:1593
+#: ../src/cddb_dialog.c:1939
msgid "Sending request…"
msgstr "Odesílá se požadavek…"
-#: ../src/cddb_dialog.c:947 ../src/cddb_dialog.c:1593
-#: ../src/cddb_dialog.c:1931 ../src/cddb_dialog.c:3490
+#: ../src/cddb_dialog.c:952 ../src/cddb_dialog.c:1597
+#: ../src/cddb_dialog.c:1943 ../src/cddb_dialog.c:3505
#, c-format
msgid "Cannot send the request ‘%s’"
msgstr "Nelze odeslat požadavek „%s“"
@@ -3373,108 +3421,108 @@ msgstr "Nelze odeslat požadavek „%s“"
#.
#. * Read the answer
#.
-#: ../src/cddb_dialog.c:959 ../src/cddb_dialog.c:1620
-#: ../src/cddb_dialog.c:3508
+#: ../src/cddb_dialog.c:964 ../src/cddb_dialog.c:1624
+#: ../src/cddb_dialog.c:3523
msgid "Receiving data…"
msgstr "Přijímají se data…"
-#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1627
-#: ../src/cddb_dialog.c:1962 ../src/cddb_dialog.c:3515
+#: ../src/cddb_dialog.c:971 ../src/cddb_dialog.c:1631
+#: ../src/cddb_dialog.c:1974 ../src/cddb_dialog.c:3530
msgid "The server returned a bad response"
msgstr "Server vrátil špatnou odpověď"
-#: ../src/cddb_dialog.c:982 ../src/cddb_dialog.c:997 ../src/cddb_dialog.c:1018
-#: ../src/cddb_dialog.c:1640 ../src/cddb_dialog.c:1978
-#: ../src/cddb_dialog.c:3532
+#: ../src/cddb_dialog.c:987 ../src/cddb_dialog.c:1002
+#: ../src/cddb_dialog.c:1023 ../src/cddb_dialog.c:1644
+#: ../src/cddb_dialog.c:1990 ../src/cddb_dialog.c:3547
#, c-format
msgid "The server returned a bad response ‘%s’"
msgstr "Server vrátil špatnou odpověď „%s“"
#. Load the track list of the album
-#: ../src/cddb_dialog.c:1233
+#: ../src/cddb_dialog.c:1235
msgid "Loading album track list…"
msgstr "Načítá se seznam skladeb z alba…"
-#: ../src/cddb_dialog.c:1787
+#: ../src/cddb_dialog.c:1791
#, c-format
msgid "Sorry, the web-based search is currently not available"
msgstr "Bohužel, ale vyhledávání na webu není v tuto chvíli dostupné"
-#: ../src/cddb_dialog.c:1789 ../src/cddb_dialog.c:2149
+#: ../src/cddb_dialog.c:1794 ../src/cddb_dialog.c:2161
#, c-format
msgid "Found one matching album"
-msgid_plural "Found %d matching albums"
+msgid_plural "Found %u matching albums"
msgstr[0] "Nalezeno jedno odpovídajících album"
-msgstr[1] "Nalezena %d odpovídající alba"
-msgstr[2] "Nalezeno %d odpovídajících alb"
+msgstr[1] "Nalezena %u odpovídající alba"
+msgstr[2] "Nalezeno %u odpovídajících alb"
-#: ../src/cddb_dialog.c:1950
+#: ../src/cddb_dialog.c:1962
#, c-format
msgid "Receiving data of page %d (album %d/%d)…"
msgstr "Přijímají se data ze stránky %d (album %d/%d)…"
-#: ../src/cddb_dialog.c:1952
+#: ../src/cddb_dialog.c:1964
#, c-format
msgid "Receiving data of page %d…"
msgstr "Přijímají se data ze stránky %d"
-#: ../src/cddb_dialog.c:2116
+#: ../src/cddb_dialog.c:2128
#, c-format
msgid "More results to load…"
msgstr "Další výsledky k načtení…"
-#: ../src/cddb_dialog.c:2296
+#: ../src/cddb_dialog.c:2305
msgid "The number of CDDB results does not match the number of selected files"
msgstr "Počet výsledků CDDB neodpovídá počtu vybraných souborů"
-#: ../src/cddb_dialog.c:2302
+#: ../src/cddb_dialog.c:2311
msgid "Write Tag from CDDB"
msgstr "Zápis štítku z CDDB"
-#: ../src/cddb_dialog.c:3006
+#: ../src/cddb_dialog.c:3016
msgid "Ready to search"
msgstr "Připraveno k hledání"
-#: ../src/cddb_dialog.c:3094 ../src/load_files_dialog.c:261
-#: ../src/setting.c:325
+#: ../src/cddb_dialog.c:3107 ../src/load_files_dialog.c:263
+#: ../src/setting.c:327
#, c-format
msgid "Cannot open file ‘%s’: %s"
msgstr "Nelze otevřít soubor „%s“: %s"
-#: ../src/cddb_dialog.c:3321
+#: ../src/cddb_dialog.c:3333
#, c-format
msgid "No file selected"
msgstr "Není vybrán žádný soubor"
#. The CD redbook standard defines the maximum number of tracks as 99, any
#. queries with more than 99 tracks will never return a result.
-#: ../src/cddb_dialog.c:3329
+#: ../src/cddb_dialog.c:3341
#, c-format
msgid "More than 99 files selected. Cannot send request"
msgstr "Je vybráno více než 99 souborů. Nelze zaslat požadavek"
-#: ../src/cddb_dialog.c:3335
+#: ../src/cddb_dialog.c:3347
#, c-format
msgid "One file selected"
-msgid_plural "%d files selected"
+msgid_plural "%u files selected"
msgstr[0] "Vybrán jeden soubor"
-msgstr[1] "Vybrány %d soubory"
-msgstr[2] "Vybráno %d souborů"
+msgstr[1] "Vybrány %u soubory"
+msgstr[2] "Vybráno %u souborů"
#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb_dialog.c:3480
+#: ../src/cddb_dialog.c:3495
#, c-format
-msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
+msgid "Sending request (disc ID: %s, #tracks: %u, Disc length: %u)…"
msgstr ""
-"Posílá se požadavek (ID disku: %s, číslo skladby: %d, délka disku: %d)…"
+"Posílá se požadavek (ID disku: %s, číslo skladby: %u, délka disku: %u)…"
-#: ../src/cddb_dialog.c:3648
+#: ../src/cddb_dialog.c:3663
#, c-format
msgid "DiscID ‘%s’ gave one matching album"
-msgid_plural "DiscID ‘%s’ gave %d matching albums"
+msgid_plural "DiscID ‘%s’ gave %u matching albums"
msgstr[0] "Identifikátor disku „%s“ poskytl jedno odpovídající album"
-msgstr[1] "Identifikátor disku „%s“ poskytl %d odpovídající alba"
-msgstr[2] "Identifikátor disku „%s“ poskytl %d odpovídajících alb"
+msgstr[1] "Identifikátor disku „%s“ poskytl %u odpovídající alba"
+msgstr[2] "Identifikátor disku „%s“ poskytl %u odpovídajících alb"
#: ../src/charset.c:46
msgid "Arabic (IBM-864)"
@@ -3676,7 +3724,7 @@ msgstr "Řetězec „%s“ v UTF-8 nelze převést do kódování názvu souboru
msgid "The string ‘%s’ could not be converted into UTF-8: %s"
msgstr "Řetězec „%s“ nelze převést do UTF-8: %s"
-#: ../src/easytag.c:243
+#: ../src/easytag.c:250
#, c-format
msgid "A file was changed by an external program"
msgid_plural "%d files were changed by an external program"
@@ -3684,184 +3732,197 @@ msgstr[0] "Soubor byl změněn externím programem"
msgstr[1] "%d soubory byly změněny externím programem"
msgstr[2] "%d souborů bylo změněno externím programem"
-#: ../src/easytag.c:252
+#: ../src/easytag.c:259
msgid "Do you want to continue saving the file?"
msgstr "Chcete pokračovat v ukládání souboru?"
-#: ../src/easytag.c:313 ../src/easytag.c:334
+#: ../src/easytag.c:320 ../src/easytag.c:341
msgid "Saving files was stopped"
msgstr "Ukládání souborů bylo zastaveno"
-#: ../src/easytag.c:336
+#: ../src/easytag.c:343
msgid "All files have been saved"
msgstr "Všechny soubory byly uloženy"
-#: ../src/easytag.c:455
+#: ../src/easytag.c:463
#, c-format
msgid "Do you want to write the tag of file ‘%s’?"
msgstr "Chcete zapsat štítek do souboru „%s“?"
-#: ../src/easytag.c:457
+#: ../src/easytag.c:465
msgid "Confirm Tag Writing"
msgstr "Potvrzení zápisu štítku"
#. Directories and filename changed
-#: ../src/easytag.c:558
+#: ../src/easytag.c:566
msgid "Rename File and Directory"
msgstr "Přejmenovat soubor a složku"
-#: ../src/easytag.c:559
+#: ../src/easytag.c:567
msgid "File and directory rename confirmation required"
msgstr "Je požadováno schválení přejmenování souboru a složky"
-#: ../src/easytag.c:560
+#: ../src/easytag.c:568
#, c-format
msgid "Do you want to rename the file and directory ‘%s’ to ‘%s’?"
msgstr "Chcete přejmenovat soubor a složku „%s“ na „%s“?"
-#: ../src/easytag.c:566
+#: ../src/easytag.c:574
msgid "Directory rename confirmation required"
msgstr "Je požadováno schválení přejmenování složky"
-#: ../src/easytag.c:567
+#: ../src/easytag.c:575
#, c-format
msgid "Do you want to rename the directory ‘%s’ to ‘%s’?"
msgstr "Chcete přejmenovat složku „%s“ na „%s“?"
-#: ../src/easytag.c:575
+#: ../src/easytag.c:583
msgid "File rename confirmation required"
msgstr "Je požadováno schválení přejmenování souboru"
-#: ../src/easytag.c:576
+#: ../src/easytag.c:584
#, c-format
msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
msgstr "Chcete přejmenovat soubor „%s“ na „%s“?"
-#: ../src/easytag.c:648
+#: ../src/easytag.c:654
#, c-format
msgid "Cannot rename file ‘%s’ to ‘%s’"
msgstr "Nelze přejmenovat soubor „%s“ na „%s“"
-#: ../src/easytag.c:662
+#: ../src/easytag.c:668
#, c-format
msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
msgstr "Nelze přejmenovat soubor „%s“ na „%s“: %s"
-#: ../src/easytag.c:667
+#: ../src/easytag.c:673
msgid "File(s) not renamed"
msgstr "Soubor či soubory nebyly přejmenovány"
-#: ../src/easytag.c:852
+#: ../src/easytag.c:858
#, c-format
msgid "Writing tag of ‘%s’"
msgstr "Zapisuje se štítek do „%s“"
-#: ../src/easytag.c:860
+#: ../src/easytag.c:866
#, c-format
msgid "Wrote tag of ‘%s’"
msgstr "Zapsán štítek do „%s“"
-#: ../src/easytag.c:876
+#: ../src/easytag.c:882
#, c-format
msgid "Cannot write tag in file ‘%s’"
msgstr "Nelze zapsat štítek do souboru „%s“"
-#: ../src/easytag.c:880
+#: ../src/easytag.c:886
msgid "Tag Write Error"
msgstr "Chyba při zápisu štítku"
-#: ../src/easytag.c:955 ../src/easytag.c:1183
+#: ../src/easytag.c:961 ../src/easytag.c:1192
#, c-format
msgid "Cannot read directory ‘%s’"
msgstr "Nelze číst složku „%s“"
-#: ../src/easytag.c:959
+#: ../src/easytag.c:965
msgid "Directory Read Error"
msgstr "Chyba při čtení složky"
#. Read the directory recursively
-#: ../src/easytag.c:980
+#: ../src/easytag.c:986
#, c-format
msgid "Search in progress…"
msgstr "Probíhá hledání…"
-#: ../src/easytag.c:1004 ../src/et_core.c:2962
-#, c-format
-msgid "File: ‘%s’"
-msgstr "Soubor: „%s“"
-
-#: ../src/easytag.c:1051
+#: ../src/easytag.c:1060
#, c-format
msgid "Found one file in this directory and subdirectories"
-msgid_plural "Found %d files in this directory and subdirectories"
+msgid_plural "Found %u files in this directory and subdirectories"
msgstr[0] "Nalezen jeden soubor v této složce a jejích podsložkách"
-msgstr[1] "Nalezeny %d soubory v této složce a jejích podsložkách"
-msgstr[2] "Nalezeno %d souborů v této složce a jejích podsložkách"
+msgstr[1] "Nalezeny %u soubory v této složce a jejích podsložkách"
+msgstr[2] "Nalezeno %u souborů v této složce a jejích podsložkách"
-#: ../src/easytag.c:1058
+#: ../src/easytag.c:1067
#, c-format
msgid "Found one file in this directory"
-msgid_plural "Found %d files in this directory"
+msgid_plural "Found %u files in this directory"
msgstr[0] "Nalezen jeden soubor v této složce"
-msgstr[1] "Nalezeny %d soubory v této složce"
-msgstr[2] "Nalezeno %d souborů v této složce"
+msgstr[1] "Nalezeny %u soubory v této složce"
+msgstr[2] "Nalezeno %u souborů v této složce"
-#: ../src/easytag.c:1075
+#: ../src/easytag.c:1084
msgid "No file found in this directory and subdirectories"
msgstr "V této složce ani jejích podsložkách nebyl nalezen žádný soubor"
-#: ../src/easytag.c:1077
+#: ../src/easytag.c:1086
msgid "No file found in this directory"
msgstr "V této složce nebyl nalezen žádný soubor"
-#: ../src/easytag.c:1147
+#: ../src/easytag.c:1156
#, c-format
msgid "Error opening directory ‘%s’: %s"
msgstr "Chyba otevírání složky „%s“: %s"
-#: ../src/easytag.c:1203
+#: ../src/easytag.c:1212
msgid "Searching for audio files…"
msgstr "Vyhledávají se zvukové soubory…"
-#: ../src/easytag.c:1204
+#: ../src/easytag.c:1213
msgid "Searching"
msgstr "Hledání"
-#: ../src/easytag.c:1205
+#: ../src/easytag.c:1214
msgid "_Stop"
msgstr "Za_stavit"
-#: ../src/et_core.c:507
+#: ../src/file_area.c:285 ../src/file_area.c:340
+msgid "File not found"
+msgstr "Soubor nebyl nalezen"
+
+#: ../src/file_area.c:290 ../src/load_files_dialog.c:223
+#, c-format
+msgid "Cannot query file information ‘%s’"
+msgstr "Nelze se dotázat na informace o souboru „%s“"
+
+#: ../src/file_area.c:324
+msgid "Read-only file"
+msgstr "Soubor jen ke čtení"
+
+#: ../src/file_list.c:252
+#, c-format
+msgid "Error reading ID3 tag from file ‘%s’: %s"
+msgstr "Chyba při čtení štítku ID3 ze souboru „%s“: %s"
+
+#: ../src/file_list.c:263
#, c-format
msgid "Error reading tag from Ogg file ‘%s’: %s"
msgstr "Chyba při čtení štítku ze souboru ogg „%s“: %s"
-#: ../src/et_core.c:518
+#: ../src/file_list.c:274
#, c-format
msgid "Error reading tag from FLAC file ‘%s’: %s"
msgstr "Chyba při čtení štítku ze souboru FLAC „%s“: %s"
-#: ../src/et_core.c:528
+#: ../src/file_list.c:284
#, c-format
msgid "Error reading APE tag from file ‘%s’: %s"
msgstr "Chyba při čtení štítku APE ze souboru „%s“: %s"
-#: ../src/et_core.c:538
+#: ../src/file_list.c:294
#, c-format
msgid "Error reading tag from MP4 file ‘%s’: %s"
msgstr "Chyba při čtení štítku ze souboru MP4 „%s“: %s"
-#: ../src/et_core.c:549
+#: ../src/file_list.c:305
#, c-format
msgid "Error reading tag from WavPack file ‘%s’: %s"
msgstr "Chyba při čtení štítku ze souboru WavPack „%s“: %s"
-#: ../src/et_core.c:560
+#: ../src/file_list.c:316
#, c-format
msgid "Error reading tag from Opus file ‘%s’: %s"
msgstr "Chyba při čtení štítku ze souboru Opus „%s“: %s"
-#: ../src/et_core.c:576
+#: ../src/file_list.c:334
#, c-format
msgid ""
"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
@@ -3870,223 +3931,168 @@ msgstr ""
"Vypadá to, že údaj o roce „%s“ v souboru „%s“ je neplatný. Při uložení "
"štítku bude tento údaj ztracen"
-#: ../src/et_core.c:711
+#: ../src/file_list.c:472
#, c-format
msgid "Automatic corrections applied for file ‘%s’"
msgstr "Pro soubor „%s“ byly použity automatické korekce."
-#. And refresh the number of files in this directory
-#: ../src/et_core.c:2986
-#, c-format
-msgid "One file"
-msgid_plural "%u files"
-msgstr[0] "jeden soubor"
-msgstr[1] "%u soubory"
-msgstr[2] "%u souborů"
-
-#. Bitrate
-#: ../src/et_core.c:3017 ../src/tags/flac_header.c:179
-#: ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144
-#: ../src/tags/mpeg_header.c:239 ../src/tags/musepack_header.c:86
-#: ../src/tags/ogg_header.c:410 ../src/tags/opus_header.c:227
-#: ../src/tags/wavpack_header.c:145
-#, c-format
-msgid "%d kb/s"
-msgstr "%d kb/s"
-
-#. Samplerate
-#: ../src/et_core.c:3020 ../src/tags/flac_header.c:182
-#: ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148
-#: ../src/tags/mpeg_header.c:244 ../src/tags/musepack_header.c:89
-#: ../src/tags/ogg_header.c:413 ../src/tags/opus_header.c:230
-#: ../src/tags/wavpack_header.c:148
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
-#: ../src/et_core.c:3149
-#, c-format
-msgid "Could not convert filename ‘%s’ to system filename encoding"
-msgstr "Nelze převést název souboru „%s“ do systémového kódování názvů soborů"
-
-#: ../src/et_core.c:3151
-msgid "Try setting the environment variable G_FILENAME_ENCODING."
-msgstr "Zkuste nastavit proměnnou prostředí G_FILENAME_ENCODING"
-
-#: ../src/et_core.c:3152 ../src/scan_dialog.c:721
-msgid "Filename translation"
-msgstr "Překlad názvu souboru"
-
-#: ../src/file_area.c:279 ../src/file_area.c:334
-msgid "File not found"
-msgstr "Soubor nebyl nalezen"
-
-#: ../src/file_area.c:284 ../src/load_files_dialog.c:221
-#, c-format
-msgid "Cannot query file information ‘%s’"
-msgstr "Nelze se dotázat na informace o souboru „%s“"
-
-#: ../src/file_area.c:318
-msgid "Read-only file"
-msgstr "Soubor jen ke čtení"
-
-#: ../src/load_files_dialog.c:291
+#: ../src/load_files_dialog.c:293
#, c-format
msgid "Error reading file ‘%s’"
msgstr "Chyba při čtení souboru: %s"
-#: ../src/load_files_dialog.c:628 ../src/load_files_dialog.c:731
+#: ../src/load_files_dialog.c:633 ../src/load_files_dialog.c:736
msgid "Insert a blank line"
msgstr "Vložit prázdný řádek"
-#: ../src/load_files_dialog.c:632 ../src/load_files_dialog.c:735
+#: ../src/load_files_dialog.c:637 ../src/load_files_dialog.c:740
msgid "Delete this line"
msgstr "Smazat tento řádek"
-#: ../src/load_files_dialog.c:643 ../src/load_files_dialog.c:746
+#: ../src/load_files_dialog.c:648 ../src/load_files_dialog.c:751
msgid "Move this line up"
msgstr "Posunout tento řádek výš"
-#: ../src/load_files_dialog.c:647 ../src/load_files_dialog.c:750
+#: ../src/load_files_dialog.c:652 ../src/load_files_dialog.c:755
msgid "Move this line down"
msgstr "Posunout tento řádek níž"
-#: ../src/load_files_dialog.c:893
+#: ../src/load_files_dialog.c:898
msgid "Load Filenames From a Text File"
msgstr "Načtení názvů souborů z textového souboru"
-#: ../src/misc.c:204
+#: ../src/misc.c:179
msgid "You must type a program name"
msgstr "Musíte vyplnit název programu"
-#: ../src/misc.c:205
+#: ../src/misc.c:180
msgid "Program Name Error"
msgstr "Chyba v názvu programu"
-#: ../src/picture.c:174
+#: ../src/picture.c:175
msgid "JPEG image"
msgstr "Obrázek JPEG"
-#: ../src/picture.c:176
+#: ../src/picture.c:177
msgid "PNG image"
msgstr "Obrázek PNG"
-#: ../src/picture.c:178
+#: ../src/picture.c:179
msgid "GIF image"
msgstr "Obrázek GIF"
-#: ../src/picture.c:180
+#: ../src/picture.c:182
msgid "Unknown image"
msgstr "Neznámý obrázek"
-#: ../src/picture.c:192
+#: ../src/picture.c:194
msgid "32×32 pixel PNG file icon"
msgstr "Ikona souboru 32×32 pixelu PNG"
-#: ../src/picture.c:194
+#: ../src/picture.c:196
msgid "Other file icon"
msgstr "Jiná ikona souboru"
-#: ../src/picture.c:196
+#: ../src/picture.c:198
msgid "Cover (front)"
msgstr "Přebal (přední)"
-#: ../src/picture.c:198
+#: ../src/picture.c:200
msgid "Cover (back)"
msgstr "Přebal (zadní)"
-#: ../src/picture.c:200
+#: ../src/picture.c:202
msgid "Leaflet page"
msgstr "Stránka brožury"
-#: ../src/picture.c:202
+#: ../src/picture.c:204
msgid "Media (such as label side of CD)"
msgstr "Médium (např. potisklá strana CD)"
-#: ../src/picture.c:204
+#: ../src/picture.c:206
msgid "Lead artist/lead performer/soloist"
msgstr "Hlavní umělec/hlavní účinkující/sólista"
-#: ../src/picture.c:206
+#: ../src/picture.c:208
msgid "Artist/performer"
msgstr "Umělec/účinkující"
-#: ../src/picture.c:208
+#: ../src/picture.c:210
msgid "Conductor"
msgstr "Dirigent"
-#: ../src/picture.c:210
+#: ../src/picture.c:212
msgid "Band/Orchestra"
msgstr "Skupina/orchestr"
-#: ../src/picture.c:214
+#: ../src/picture.c:216
msgid "Lyricist/text writer"
msgstr "Textař"
-#: ../src/picture.c:216
+#: ../src/picture.c:218
msgid "Recording location"
msgstr "Místo nahrávání"
-#: ../src/picture.c:218
+#: ../src/picture.c:220
msgid "During recording"
msgstr "Během nahrávání"
-#: ../src/picture.c:220
+#: ../src/picture.c:222
msgid "During performance"
msgstr "Během představení"
-#: ../src/picture.c:222
+#: ../src/picture.c:224
msgid "Movie/video screen capture"
msgstr "Zachytávání filmu/videa"
-#: ../src/picture.c:224
+#: ../src/picture.c:226
msgid "A bright colored fish"
msgstr "Pestrobarevná ryba"
-#: ../src/picture.c:226
+#: ../src/picture.c:228
msgid "Illustration"
msgstr "Ilustrace"
-#: ../src/picture.c:228
+#: ../src/picture.c:230
msgid "Band/Artist logotype"
msgstr "Logo skupiny/umělce"
-#: ../src/picture.c:230
+#: ../src/picture.c:232
msgid "Publisher/studio logotype"
msgstr "Logo vydavatele/studia"
-#: ../src/picture.c:234
+#: ../src/picture.c:236
msgid "Unknown image type"
msgstr "Neznámý typ obrázku"
-#: ../src/picture.c:262 ../src/picture.c:271
+#: ../src/picture.c:262 ../src/picture.c:268
msgid "pixels"
msgstr "pixely"
-#: ../src/picture.c:262 ../src/picture.c:271
+#: ../src/picture.c:262 ../src/picture.c:268
msgid "Type"
msgstr "Typ"
-#: ../src/playlist_dialog.c:531
+#: ../src/playlist_dialog.c:541
#, c-format
msgid "Cannot write playlist file ‘%s’"
msgstr "Nelze zapsat soubor „%s“ se seznamem k přehrání"
-#: ../src/playlist_dialog.c:535
+#: ../src/playlist_dialog.c:545
msgid "Playlist File Error"
msgstr "Chyba souboru se seznamem k přehrání"
-#: ../src/playlist_dialog.c:543
+#: ../src/playlist_dialog.c:553
#, c-format
msgid "Wrote playlist file ‘%s’"
msgstr "Zapsán soubor „%s“ se seznamem k přehrání"
-#: ../src/playlist_dialog.c:625 ../src/scan_dialog.c:2772
-#: ../src/scan_dialog.c:2834
+#: ../src/playlist_dialog.c:636 ../src/scan_dialog.c:2819
+#: ../src/scan_dialog.c:2882
msgid "Invalid scanner mask"
msgstr "Neplatná maska průzkumníka"
-#: ../src/playlist_dialog.c:656
+#: ../src/playlist_dialog.c:667
msgid "Generate Playlist"
msgstr "Generování seznamu k přehrání"
@@ -4112,68 +4118,68 @@ msgstr ""
msgid "Invalid Path Error"
msgstr "Chyba způsobená neplatnou cestou"
-#: ../src/scan_dialog.c:307
+#: ../src/scan_dialog.c:402
#, c-format
msgid "Cannot calculate CRC value of file ‘%s’"
msgstr "Nelze vypočítat hodnotu kontrolního součtu pro soubor „%s“"
-#: ../src/scan_dialog.c:325
+#: ../src/scan_dialog.c:417
msgid "Tag successfully scanned"
msgstr "Štítek byl úspěšně prozkoumán"
-#: ../src/scan_dialog.c:328
+#: ../src/scan_dialog.c:420
#, c-format
msgid "Tag successfully scanned ‘%s’"
msgstr "Štítek v souboru „%s“ byl úspěšně prozkoumán"
-#: ../src/scan_dialog.c:371
+#: ../src/scan_dialog.c:463
#, c-format
msgid "The extension ‘%s’ was not found in filename ‘%s’"
msgstr "Přípona „%s“ nebyla v názvu souboru „%s“ nalezena"
-#: ../src/scan_dialog.c:461 ../src/scan_dialog.c:492
+#: ../src/scan_dialog.c:555 ../src/scan_dialog.c:586
#, c-format
msgid "Cannot find separator ‘%s’ within ‘%s’"
msgstr "Nelze nalézt oddělovač „%s“ vrámci „%s“"
-#: ../src/scan_dialog.c:719
+#: ../src/scan_dialog.c:811
#, c-format
msgid "Could not convert filename ‘%s’ into system filename encoding"
msgstr "Nelze převést název souboru „%s“ do systémového kódování názvů soborů"
-#: ../src/scan_dialog.c:744
+#: ../src/scan_dialog.c:836
msgid "New filename successfully scanned"
msgstr "Nový název souboru byl úspěšně prozkoumán"
-#: ../src/scan_dialog.c:748
+#: ../src/scan_dialog.c:840
#, c-format
msgid "New filename successfully scanned ‘%s’"
msgstr "Nový název souboru „%s“ byl úspěšně prozkoumán"
-#: ../src/scan_dialog.c:1111
+#: ../src/scan_dialog.c:1212
#, c-format
msgid "Error while processing fields ‘%s’"
msgstr "Chyba při zpracování polí: %s"
-#: ../src/scan_dialog.c:2042
+#: ../src/scan_dialog.c:2088
msgid "New_mask"
msgstr "Nová _maska"
#. The window
-#: ../src/scan_dialog.c:2259
+#: ../src/scan_dialog.c:2305
msgid "Tag and Filename Scan"
msgstr "Průzkum štítků a názvů souborů"
#. 'Scan selected files' button
-#: ../src/scan_dialog.c:2265
+#: ../src/scan_dialog.c:2311
msgid "Scan Files"
msgstr "Prozkoumat soubory"
-#: ../src/scan_dialog.c:2271
+#: ../src/scan_dialog.c:2317
msgid "Scan selected files"
msgstr "Prozkoumat vybrané soubory"
-#: ../src/scan_dialog.c:2909
+#: ../src/scan_dialog.c:2956
msgid "All tags have been scanned"
msgstr "Všechny štítky byly prozkoumány"
@@ -4193,18 +4199,18 @@ msgstr "Hledání souborů"
msgid "Ready to search…"
msgstr "Připraveno k hledání…"
-#: ../src/setting.c:243
+#: ../src/setting.c:245
#, c-format
msgid "Cannot write list to file ‘%s’: %s"
msgstr "Nelze zapsat seznam do souboru „%s“: %s"
#. Fall back to defaults.
-#: ../src/setting.c:348
+#: ../src/setting.c:350
msgid "Loading default ‘Fill Tag’ masks…"
msgstr "Načítá se výchozí maska pro vyplnění štítků…"
#. Fall back to defaults.
-#: ../src/setting.c:378
+#: ../src/setting.c:380
msgid "Loading default ‘Rename File’ masks…"
msgstr "Načítají se výchozí masky pro přejmenování souborů…"
@@ -4221,186 +4227,186 @@ msgstr "U vybraných souborů byl ve štítku nastaven název na „%s“"
msgid "Removed title from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán název"
-#: ../src/tag_area.c:208
+#: ../src/tag_area.c:209
#, c-format
msgid "Selected files tagged with artist ‘%s’"
msgstr "U vybraných souborů byl ve štítku nastaven umělec na „%s“"
-#: ../src/tag_area.c:213
+#: ../src/tag_area.c:214
msgid "Removed artist from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán umělec"
-#: ../src/tag_area.c:229
+#: ../src/tag_area.c:232
#, c-format
msgid "Selected files tagged with album artist ‘%s’"
msgstr "U vybraných souborů byl ve štítku nastaven umělec alba na „%s“"
-#: ../src/tag_area.c:234
+#: ../src/tag_area.c:237
msgid "Removed album artist from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán umělec alba"
-#: ../src/tag_area.c:251
+#: ../src/tag_area.c:255
#, c-format
msgid "Selected files tagged with album ‘%s’"
msgstr "U vybraných souborů bylo ve štítku nastaveno album na „%s“"
-#: ../src/tag_area.c:256
+#: ../src/tag_area.c:260
msgid "Removed album name from selected files"
msgstr "Z vybraných souborů bylo ve štítku vymazáno album"
-#: ../src/tag_area.c:294
+#: ../src/tag_area.c:298
#, c-format
msgid "Selected files tagged with disc number ‘%s/%s’"
msgstr "U vybraných souborů bylo ve štítku nastaveno číslo disku na „%s/%s“"
-#: ../src/tag_area.c:299
+#: ../src/tag_area.c:305
#, c-format
msgid "Selected files tagged with disc number like ‘xx’"
msgstr "U vybraných souborů bylo ve štítku nastaveno číslo disku ve stylu „xx“"
-#: ../src/tag_area.c:304
+#: ../src/tag_area.c:310
msgid "Removed disc number from selected files"
msgstr "Z vybraných souborů bylo ve štítku vymazáno číslo disku"
-#: ../src/tag_area.c:321
+#: ../src/tag_area.c:330
#, c-format
msgid "Selected files tagged with year ‘%s’"
msgstr "U vybraných souborů byl ve štítku nastaven rok na „%s“"
-#: ../src/tag_area.c:326
+#: ../src/tag_area.c:335
msgid "Removed year from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán rok"
-#: ../src/tag_area.c:353 ../src/tag_area.c:447
+#: ../src/tag_area.c:365 ../src/tag_area.c:470
#, c-format
msgid "Selected files tagged with track like ‘xx/%s’"
msgstr "U vybraných souborů bylo ve štítku nastaveno pořadí v podobě „xx/%s“"
-#: ../src/tag_area.c:357
+#: ../src/tag_area.c:369
#, c-format
msgid "Selected files tagged with track like ‘xx’"
msgstr "U vybraných souborů bylo ve štítku nastaveno pořadí v podobě „xx“"
-#: ../src/tag_area.c:362 ../src/tag_area.c:452
+#: ../src/tag_area.c:374 ../src/tag_area.c:475
msgid "Removed track number from selected files"
msgstr "Z vybraných souborů bylo ve štítku vymazáno číslo skladby"
#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/tag_area.c:420
+#: ../src/tag_area.c:433
#, c-format
msgid "Selected tracks numbered sequentially"
msgstr "Vybrané skladby byly ve štítku sekvenčně očíslovány"
-#: ../src/tag_area.c:469
+#: ../src/tag_area.c:495
#, c-format
msgid "Selected files tagged with genre ‘%s’"
msgstr "U vybraných souborů byl ve štítku nastaven žánr na „%s“"
-#: ../src/tag_area.c:474
+#: ../src/tag_area.c:500
msgid "Removed genre from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán žánr"
-#: ../src/tag_area.c:498
+#: ../src/tag_area.c:525
#, c-format
msgid "Selected files tagged with comment ‘%s’"
msgstr "U vybraných souborů byla ve štítku nastavena poznámka na „%s“"
-#: ../src/tag_area.c:503
+#: ../src/tag_area.c:530
msgid "Removed comment from selected files"
msgstr "Z vybraných souborů byla ve štítku vymazána poznámka"
-#: ../src/tag_area.c:519
+#: ../src/tag_area.c:548
#, c-format
msgid "Selected files tagged with composer ‘%s’"
msgstr "U vybraných souborů byl ve štítku nastaven skladatel na „%s“"
-#: ../src/tag_area.c:524
+#: ../src/tag_area.c:553
msgid "Removed composer from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán skladatel"
-#: ../src/tag_area.c:541
+#: ../src/tag_area.c:571
#, c-format
msgid "Selected files tagged with original artist ‘%s’"
msgstr "U vybraných souborů byl ve štítku nastaven původní umělec na „%s“"
-#: ../src/tag_area.c:546
+#: ../src/tag_area.c:576
msgid "Removed original artist from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán původní umělec"
-#: ../src/tag_area.c:563
+#: ../src/tag_area.c:594
#, c-format
msgid "Selected files tagged with copyright ‘%s’"
msgstr "U vybraných souborů byl ve štítku nastaven copyright na „%s“"
-#: ../src/tag_area.c:568
+#: ../src/tag_area.c:599
msgid "Removed copyright from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán copyright"
-#: ../src/tag_area.c:585
+#: ../src/tag_area.c:617
#, c-format
msgid "Selected files tagged with URL ‘%s’"
msgstr "U vybraných souborů byla ve štítku nastaven adresa URL na „%s“"
-#: ../src/tag_area.c:590
+#: ../src/tag_area.c:622
msgid "Removed URL from selected files"
msgstr "Z vybraných souborů byla ve štítku vymazána adresa URL"
-#: ../src/tag_area.c:607
+#: ../src/tag_area.c:640
#, c-format
msgid "Selected files tagged with encoder name ‘%s’"
msgstr "U vybraných souborů byl ve štítku nastaven název kodéru na „%s“"
-#: ../src/tag_area.c:612
+#: ../src/tag_area.c:645
msgid "Removed encoder name from selected files"
msgstr "Z vybraných souborů byl ve štítku vymazán název kodéru"
-#: ../src/tag_area.c:648
+#: ../src/tag_area.c:680
msgid "Selected files tagged with images"
msgstr "U vybraných souborů byly ve štítku nastaveny obrázky"
-#: ../src/tag_area.c:652
+#: ../src/tag_area.c:684
msgid "Removed images from selected files"
msgstr "Z vybraných souborů byly ve štítku vymazány obrázky"
#. Menu items
-#: ../src/tag_area.c:821
+#: ../src/tag_area.c:851
msgid "Tag selected files with this field"
msgstr "Nastavit vybraným souborům toto pole"
-#: ../src/tag_area.c:848
+#: ../src/tag_area.c:878
msgid "All uppercase"
msgstr "Vše velkými písmeny"
-#: ../src/tag_area.c:854
+#: ../src/tag_area.c:884
msgid "All lowercase"
msgstr "Vše malými písmeny"
-#: ../src/tag_area.c:860
+#: ../src/tag_area.c:890
msgid "First letter uppercase"
msgstr "První písmeno velké"
-#: ../src/tag_area.c:866
+#: ../src/tag_area.c:896
msgid "First letter uppercase of each word"
msgstr "První písmeno každého slova velké"
-#: ../src/tag_area.c:882
+#: ../src/tag_area.c:912
msgid "Insert space before uppercase letter"
msgstr "Vložit mezeru před velká písmena"
-#: ../src/tag_area.c:888
+#: ../src/tag_area.c:918
msgid "Remove duplicate spaces or underscores"
msgstr "Odstranit zdvojené mezery nebo podtržítka"
-#: ../src/tag_area.c:894
+#: ../src/tag_area.c:924
msgid "Remove all text"
msgstr "Odstranit všechen text"
-#: ../src/tag_area.c:1256 ../src/tag_area.c:1334
+#: ../src/tag_area.c:1286 ../src/tag_area.c:1364
#, c-format
msgid "Error parsing image data ‘%s’"
msgstr "Chyba při zpracování dat obrázku: %s"
-#: ../src/tag_area.c:1316
+#: ../src/tag_area.c:1346
msgid ""
"Cannot display the image because not enough data has been read to determine "
"how to create the image buffer"
@@ -4408,106 +4414,106 @@ msgstr ""
"Nelze zobrazit obrázek, protože nebyl načten dostatek dat, podle kterých by "
"se dalo určit, jaká se má vytvořit vyrovnávací paměť pro obrázek."
-#: ../src/tag_area.c:1323
+#: ../src/tag_area.c:1353
msgid "Cannot display the image"
msgstr "Nelze zobrazit obrázek"
-#: ../src/tag_area.c:1325
+#: ../src/tag_area.c:1355
msgid ""
"Not enough data has been read to determine how to create the image buffer."
msgstr ""
"Nebyl načten dostatek dat, podle kterých by se dalo určit, jaká se má "
"vytvořit vyrovnávací paměť pro obrázek."
-#: ../src/tag_area.c:1327
+#: ../src/tag_area.c:1357
msgid "Load Image File"
msgstr "Načtení souboru s obrázkem"
-#: ../src/tag_area.c:1371 ../src/tag_area.c:1396
+#: ../src/tag_area.c:1401 ../src/tag_area.c:1426
#, c-format
msgid "Image file not loaded ‘%s’"
msgstr "Soubor s obrázkem nebyl načten: %s"
-#: ../src/tag_area.c:1388
+#: ../src/tag_area.c:1418
#, c-format
msgid "Cannot open file ‘%s’"
msgstr "Nelze otevřít soubor „%s“"
-#: ../src/tag_area.c:1392
+#: ../src/tag_area.c:1422
msgid "Image File Error"
msgstr "Chyba souboru s obrázkem"
-#: ../src/tag_area.c:1403
+#: ../src/tag_area.c:1433
msgid "Image file loaded"
msgstr "Soubor s obrázkem načten"
-#: ../src/tag_area.c:1474
+#: ../src/tag_area.c:1513
msgid "Add Images"
msgstr "Přidání obrázků"
-#: ../src/tag_area.c:1485 ../src/tag_area.c:1850
+#: ../src/tag_area.c:1523 ../src/tag_area.c:1877
msgid "All Files"
msgstr "Všechny soubory"
-#: ../src/tag_area.c:1491 ../src/tag_area.c:1856
+#: ../src/tag_area.c:1530 ../src/tag_area.c:1884
msgid "PNG and JPEG"
msgstr "PNG a JPEG"
-#: ../src/tag_area.c:1635
+#: ../src/tag_area.c:1671
#, c-format
msgid "Image Properties %d/%d"
msgstr "Vlastnosti obrázku %d/%d"
-#: ../src/tag_area.c:1835
+#: ../src/tag_area.c:1863
#, c-format
msgid "Save Image %d/%d"
msgstr "Ukládání obrázku %d/%d"
-#: ../src/tag_area.c:1912
+#: ../src/tag_area.c:1943
#, c-format
msgid "Image file not saved ‘%s’"
msgstr "Soubor s obrázkem nebyl uložen: %s"
-#: ../src/tag_area.c:2255
+#: ../src/tag_area.c:2291
msgid "Tag selected files with this genre"
msgstr "Nastavit vybraným souborům tento žánr"
-#: ../src/tag_area.c:2986
+#: ../src/tag_area.c:3018
msgid "ID3 Tag"
msgstr "Štítek ID3"
-#: ../src/tag_area.c:2991
+#: ../src/tag_area.c:3023
msgid "Ogg Vorbis Tag"
msgstr "Štítek Ogg Vorbis"
-#: ../src/tag_area.c:2996
+#: ../src/tag_area.c:3028
msgid "FLAC Vorbis Tag"
msgstr "Štítek FLAC"
-#: ../src/tag_area.c:3000
+#: ../src/tag_area.c:3032
msgid "APE Tag"
msgstr "Štítek APE"
-#: ../src/tag_area.c:3004
+#: ../src/tag_area.c:3036
msgid "MP4/M4A/AAC Tag"
msgstr "Štítek MP4/M4A/AAC"
-#: ../src/tag_area.c:3009
+#: ../src/tag_area.c:3041
msgid "Wavpack Tag"
msgstr "Štítek Wavpack"
-#: ../src/tag_area.c:3014
+#: ../src/tag_area.c:3046
msgid "Opus Tag"
msgstr "Štítek Opus"
-#: ../src/tag_area.c:3254
+#: ../src/tag_area.c:3286
#, c-format
-msgid "Images (%d)"
-msgstr "Obrázky (%d)"
+msgid "Images (%u)"
+msgstr "Obrázky (%u)"
#: ../src/tags/ape_tag.c:63 ../src/tags/mp4_header.cc:58
-#: ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:65
-#: ../src/tags/mp4_tag.cc:78 ../src/tags/mp4_tag.cc:84
+#: ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:72
+#: ../src/tags/mp4_tag.cc:85 ../src/tags/mp4_tag.cc:91
#: ../src/tags/ogg_header.c:227
#, c-format
msgid "Error while opening file: %s"
@@ -4517,11 +4523,11 @@ msgstr "Chyba při otevírání souboru: %s"
msgid "Failed to write APE tag"
msgstr "Selhal zápis štítku APE"
-#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:123
+#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:116
msgid "Error opening FLAC file"
msgstr "Chyba při otevírání souboru FLAC"
-#: ../src/tags/flac_header.c:172
+#: ../src/tags/flac_header.c:165
msgid "FLAC File"
msgstr "Soubor FLAC"
@@ -4529,25 +4535,25 @@ msgstr "Soubor FLAC"
#. Mode
#. mpeg4ip library seems to always return -1
#. Mode
-#: ../src/tags/flac_header.c:185 ../src/tags/mp4_header.cc:152
-#: ../src/tags/ogg_header.c:416 ../src/tags/opus_header.c:233
+#: ../src/tags/flac_header.c:178 ../src/tags/mp4_header.cc:152
+#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:236
#: ../src/tags/wavpack_header.c:151
msgid "Channels:"
msgstr "Kanály:"
-#: ../src/tags/flac_tag.c:845 ../src/tags/flac_tag.c:878
-#: ../src/tags/flac_tag.c:892
+#: ../src/tags/flac_tag.c:831 ../src/tags/flac_tag.c:864
+#: ../src/tags/flac_tag.c:878
#, c-format
msgid "Error while opening file ‘%s’ as FLAC: %s"
msgstr "Chyba při otevírání souboru „%s“ jako FLAC: %s"
-#: ../src/tags/flac_tag.c:1185 ../src/tags/flac_tag.c:1197
-#: ../src/tags/flac_tag.c:1217
+#: ../src/tags/flac_tag.c:1160 ../src/tags/flac_tag.c:1172
+#: ../src/tags/flac_tag.c:1192
#, c-format
msgid "Failed to write comments to file ‘%s’: %s"
msgstr "Selhal zápis poznámek do souboru „%s“: %s"
-#: ../src/tags/id3_tag.c:206
+#: ../src/tags/id3_tag.c:209
#, c-format
msgid ""
"As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
@@ -4556,31 +4562,31 @@ msgstr ""
"Protože by následující poškozený soubor „%s“ způsobil chybu v knihovně "
"id3lib, nebude zpracován"
-#: ../src/tags/id3_tag.c:208
+#: ../src/tags/id3_tag.c:211
msgid "Corrupted file"
msgstr "Poškozený soubor"
-#: ../src/tags/id3_tag.c:596
+#: ../src/tags/id3_tag.c:613
#, c-format
msgid "Removed tag of ‘%s’"
msgstr "Odstraněn štítek z „%s“"
-#: ../src/tags/id3_tag.c:603 ../src/tags/id3_tag.c:730
+#: ../src/tags/id3_tag.c:620 ../src/tags/id3_tag.c:750
#, c-format
msgid "Error while removing ID3v1 tag of ‘%s’: %s"
msgstr "Chyba při odstraňování štítku ID3v1 v „%s“: %s"
-#: ../src/tags/id3_tag.c:612 ../src/tags/id3_tag.c:693
+#: ../src/tags/id3_tag.c:629 ../src/tags/id3_tag.c:713
#, c-format
msgid "Error while removing ID3v2 tag of ‘%s’: %s"
msgstr "Chyba při odstraňování štítku ID3v2 v „%s“: %s"
-#: ../src/tags/id3_tag.c:638
+#: ../src/tags/id3_tag.c:655
#, c-format
msgid "Error while updating ID3v2 tag of ‘%s’: %s"
msgstr "Chyba při aktualizaci štítku ID3v1 v „%s“: %s"
-#: ../src/tags/id3_tag.c:668
+#: ../src/tags/id3_tag.c:687
msgid ""
"You have tried to save this tag to Unicode but it was detected that your "
"version of id3lib is buggy"
@@ -4588,7 +4594,7 @@ msgstr ""
"Zkoušíte uložit tento šítek v Unikódu, ale bylo zjištěno, že máte verzi "
"id3lib, která obsahuje chyby."
-#: ../src/tags/id3_tag.c:670
+#: ../src/tags/id3_tag.c:689
#, c-format
msgid ""
"If you reload this file, some characters in the tag may not be displayed "
@@ -4607,84 +4613,84 @@ msgstr ""
"\n"
"Soubor: %s"
-#: ../src/tags/id3_tag.c:677
+#: ../src/tags/id3_tag.c:696
msgid "Buggy id3lib"
msgstr "Chybová id3lib"
-#: ../src/tags/id3_tag.c:718
+#: ../src/tags/id3_tag.c:738
#, c-format
msgid "Error while updating ID3v1 tag of ‘%s’: %s"
msgstr "Chyba při aktualizaci štítku ID3v1 v „%s“: %s"
-#: ../src/tags/id3_tag.c:752
+#: ../src/tags/id3_tag.c:772
msgid "No error reported"
msgstr "Neohlášena žádná chyba"
-#: ../src/tags/id3_tag.c:754
+#: ../src/tags/id3_tag.c:774
msgid "No available memory"
msgstr "Není dostupná žádná pamět"
-#: ../src/tags/id3_tag.c:756
+#: ../src/tags/id3_tag.c:776
msgid "No data to parse"
msgstr "Žádná data ke zpracování"
-#: ../src/tags/id3_tag.c:758
+#: ../src/tags/id3_tag.c:778
msgid "Improperly formatted data"
msgstr "Chybně zformátovaná data"
-#: ../src/tags/id3_tag.c:760
+#: ../src/tags/id3_tag.c:780
msgid "No buffer to write to"
msgstr "Nebyla nalezena vyrovnávací paměť pro zápis"
-#: ../src/tags/id3_tag.c:762
+#: ../src/tags/id3_tag.c:782
msgid "Buffer is too small"
msgstr "Vyrovnávací paměť je příliš malá"
-#: ../src/tags/id3_tag.c:764
+#: ../src/tags/id3_tag.c:784
msgid "Invalid frame ID"
msgstr "Neplatné ID rámce"
-#: ../src/tags/id3_tag.c:766
+#: ../src/tags/id3_tag.c:786
msgid "Requested field not found"
msgstr "Požadované pole nebylo nalezeno"
-#: ../src/tags/id3_tag.c:768
+#: ../src/tags/id3_tag.c:788
msgid "Unknown field type"
msgstr "Neznámý typ pole"
-#: ../src/tags/id3_tag.c:770
+#: ../src/tags/id3_tag.c:790
msgid "Tag is already attached to a file"
msgstr "Štítek je již k souboru přiložen"
-#: ../src/tags/id3_tag.c:772
+#: ../src/tags/id3_tag.c:792
msgid "Invalid tag version"
msgstr "Neplatná verze štítku"
-#: ../src/tags/id3_tag.c:774
+#: ../src/tags/id3_tag.c:794
msgid "No file to parse"
msgstr "Žádný soubor ke zpracování"
-#: ../src/tags/id3_tag.c:776
+#: ../src/tags/id3_tag.c:796
msgid "Attempting to write to a read-only file"
msgstr "Pokus o zápis do souboru jen ke čtení"
-#: ../src/tags/id3_tag.c:778
+#: ../src/tags/id3_tag.c:798
msgid "Error in compression/uncompression"
msgstr "Chyba při komprimaci/dekomprimaci"
-#: ../src/tags/id3_tag.c:780
+#: ../src/tags/id3_tag.c:800
msgid "Unknown error message"
msgstr "Neznámá chybová zpráva"
-#: ../src/tags/id3_tag.c:1457
+#: ../src/tags/id3_tag.c:1487
msgid "Error while creating temporary file"
msgstr "Chyba při vytváření dočasného souboru"
#: ../src/tags/id3v24_tag.c:132 ../src/tags/id3v24_tag.c:187
#: ../src/tags/id3v24_tag.c:225 ../src/tags/id3v24_tag.c:236
-#: ../src/tags/id3v24_tag.c:941 ../src/tags/id3v24_tag.c:948
-#: ../src/tags/id3v24_tag.c:974 ../src/tags/id3v24_tag.c:1014
-#: ../src/tags/mp4_tag.cc:94
+#: ../src/tags/id3v24_tag.c:952 ../src/tags/id3v24_tag.c:959
+#: ../src/tags/id3v24_tag.c:985 ../src/tags/id3v24_tag.c:1025
+#: ../src/tags/mp4_tag.cc:101 ../src/tags/ogg_header.c:277
msgid "Error reading tags from file"
msgstr "Chyba při čtení štítků ze souboru"
@@ -4697,8 +4703,8 @@ msgstr "Chyba při otevírání zvukového soubor Monkey"
msgid "Profile:"
msgstr "Profil:"
-#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:85
-#: ../src/tags/mp4_tag.cc:281
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:92
+#: ../src/tags/mp4_tag.cc:288
msgid "MP4 format invalid"
msgstr "Neplatný formát MP4"
@@ -4710,48 +4716,48 @@ msgstr "Chyba při čtení vlastností ze souboru"
msgid "MP4/AAC File"
msgstr "Soubor MP4/AAC"
-#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:235
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:248
#, c-format
msgid "~%d kb/s"
msgstr "~%d kb/s"
-#: ../src/tags/mp4_tag.cc:257 ../src/tags/mp4_tag.cc:274
-#: ../src/tags/mp4_tag.cc:280
+#: ../src/tags/mp4_tag.cc:265 ../src/tags/mp4_tag.cc:281
+#: ../src/tags/mp4_tag.cc:287
#, c-format
msgid "Error while opening file ‘%s’: %s"
msgstr "Chyba při otevírání souboru: „%s“: %s"
-#: ../src/tags/mp4_tag.cc:292
+#: ../src/tags/mp4_tag.cc:298
#, c-format
msgid "Error reading tags from file ‘%s’"
msgstr "Chyba při čtení štítků ze souboru „%s“"
-#: ../src/tags/mpeg_header.c:50
+#: ../src/tags/mpeg_header.c:51
msgid "Stereo"
msgstr "stereo"
-#: ../src/tags/mpeg_header.c:51
+#: ../src/tags/mpeg_header.c:52
msgid "Joint stereo"
msgstr "joint stereo"
-#: ../src/tags/mpeg_header.c:52
+#: ../src/tags/mpeg_header.c:53
msgid "Dual channel"
msgstr "dva kanály"
-#: ../src/tags/mpeg_header.c:53
+#: ../src/tags/mpeg_header.c:54
msgid "Single channel"
msgstr "jeden kanál"
-#: ../src/tags/mpeg_header.c:205
+#: ../src/tags/mpeg_header.c:216
msgid "MP3 File"
msgstr "Soubor MP3"
-#: ../src/tags/mpeg_header.c:208
+#: ../src/tags/mpeg_header.c:220
msgid "MP2 File"
msgstr "Soubor MP2"
#. MPEG, Layer versions
-#: ../src/tags/mpeg_header.c:215
+#: ../src/tags/mpeg_header.c:228
msgid "MPEG"
msgstr "MPEG"
@@ -4795,7 +4801,7 @@ msgstr ""
msgid "Failed to open file as Vorbis: %s"
msgstr "Selhalo otevření souboru jako Vorbis: %s"
-#: ../src/tags/ogg_header.c:388
+#: ../src/tags/ogg_header.c:387
msgid "Ogg Vorbis File"
msgstr "Soubor Ogg Vorbis"
@@ -4803,7 +4809,7 @@ msgstr "Soubor Ogg Vorbis"
msgid "Speex File"
msgstr "Soubor Speex"
-#: ../src/tags/opus_header.c:220
+#: ../src/tags/opus_header.c:223
msgid "Opus File"
msgstr "Soubor Opus"
diff --git a/po/nb.po b/po/nb.po
index ca53c78..415091a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,16 +1,15 @@
# Norwegian translation of easytag.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the easytag-2-2 package.
-# Åka Sikrom <a4 at hush.com>, 2014.
+# This file is distributed under the same license as the easytag package.
+# Åka Sikrom <a4 æt hush dåt com>, 2015.
#
msgid ""
msgstr ""
"Project-Id-Version: easytag-2-2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-25 17:21+0000\n"
-"PO-Revision-Date: 2014-05-26 10:17+0100\n"
-"Last-Translator: Åka Sikrom <a4 at hush.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-02-16 20:11+0100\n"
+"PO-Revision-Date: 2015-02-15 21:49+0100\n"
+"Last-Translator: Åka Sikrom <a4 æt hush dåt com>\n"
"Language-Team: Norwegian bokmål\n"
"Language: Norwegian bokmål\n"
"MIME-Version: 1.0\n"
@@ -19,7 +18,16 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: ../data/easytag.appdata.xml.in.h:1
+#. Name and summary taken from the desktop file.
+#: ../data/easytag.appdata.xml.in.h:2 ../data/easytag.desktop.in.h:1
+msgid "EasyTAG"
+msgstr "EasyTAG"
+
+#: ../data/easytag.appdata.xml.in.h:3 ../data/easytag.desktop.in.h:3
+msgid "Edit audio file metadata"
+msgstr "Rediger metadata i lydfiler"
+
+#: ../data/easytag.appdata.xml.in.h:4
msgid ""
"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
"Vorbis, MusePack, Monkey's Audio and WavPack files."
@@ -27,7 +35,7 @@ msgstr ""
"Vis og rediger tagger for MP3-, MP2-, MP4/AAC-, FLAC., Ogg Opus-, Ogg "
"Speex-, Ogg Vorbis-, MusePack-, Monkey's Audio- og WavPack-filer."
-#: ../data/easytag.appdata.xml.in.h:2
+#: ../data/easytag.appdata.xml.in.h:5
msgid ""
"Look up albums in online databases, bulk edit tags, create playlists and "
"rename a collection of files."
@@ -35,7 +43,7 @@ msgstr ""
"Finn album i databaser på nett, rediger tagger buntvis, lag spillelister og "
"gi nytt navn til flere filer."
-#: ../data/easytag.appdata.xml.in.h:3
+#: ../data/easytag.appdata.xml.in.h:6
msgid ""
"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
"Windows."
@@ -43,4848 +51,4740 @@ msgstr ""
"Et enkelt og greit GTK+-grensesnitt gjør det enklere å tagge med GNU/Linux "
"og Windows."
-#: ../data/easytag.desktop.in.h:1
-msgid "Sound File Metadata Editor"
-msgstr "Metadata-behandler for lydfiler"
-
#: ../data/easytag.desktop.in.h:2
-msgid "Edit sound file metadata"
-msgstr "Rediger metadata i lydfiler"
+msgid "Audio File Metadata Editor"
+msgstr "Metadata-behandler for lydfiler"
#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: ../data/easytag.desktop.in.h:4
-msgid "mp3;tag;audio;"
-msgstr "mp3;tagg;lyd;"
-
-#: ../src/about.c:89
-msgid ""
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Dette programmet utgis som fri programvare. Du kan dele det med andre og "
-"endre det i henhold til GNU General Public-lisensen, som utgis av Free "
-"Software Foundation. Du kan selv velge om versjon 2 eller en senere versjon "
-"av lisensen skal være gjeldende.\n"
-"\n"
-"Dette programmet er utgitt i håp om at det kommer til nytte. Det stilles for "
-"øvrig INGEN GARANTI for at programmet fungerer slik du ønsker, og heller "
-"ikke at det egner seg til SALGSVIRKSOMHET eller at det PASSER TIL ET BESTEMT "
-"FORMÅL. Les GNU General Public-lisensen for ytterligere detaljer.\n"
-"\n"
-"Det skal ha fulgt med en kopi av GNU General Public-lisensen sammen med "
-"dette programmet. Hvis ikke, kan du lese aktuell versjon på <http://www.gnu."
-"org/licenses/>."
+#: ../data/easytag.desktop.in.h:5
+msgid "mp3;tag;audio;music;"
+msgstr "mp3;tagg;lyd;musikk;"
-#. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:106
-msgid "translator-credits"
-msgstr "Samm Rokki"
+#: ../data/easytag-nautilus.metainfo.xml.in.h:1
+#: ../nautilus-extension/nautilus-easytag.c:247
+msgid "Open with EasyTAG"
+msgstr "Åpne med EasyTAG"
-#: ../src/about.c:116
-msgid "View and edit tags in audio files"
-msgstr "Vis og rediger tagger i lydfiler"
+#: ../data/easytag-nautilus.metainfo.xml.in.h:2
+msgid "Open directories and audio files with EasyTAG using the context menu"
+msgstr "Åpne mapper og lydfiler med EasyTAG via skrivebordets lokalmenyer"
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:113 ../src/mp4_header.cc:46
-#: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
-#: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
-#: ../src/mp4_tag.cc:283
-#, c-format
-msgid "Error while opening file: '%s' (%s)."
-msgstr "Feil ved åpning av fila «%s» (%s)."
+#: ../data/browser.ui.h:1
+msgid "Browse Directory With"
+msgstr "Utforsk mappe med"
-#: ../src/application.c:37
-msgid "Print the version and exit"
-msgstr "Skriv ut versjonsnummer og avslutt"
+#: ../data/browser.ui.h:2
+msgid "Run Program"
+msgstr "Kjør program"
-#: ../src/application.c:89
-#, c-format
-msgid "Website: %s"
-msgstr "Nettside: %s"
+#: ../data/browser.ui.h:3
+msgid ""
+"Enter the program to run; it will receive the current directory as a "
+"parameter"
+msgstr ""
+"Skriv navnet på programmet som skal kjøres. Gjeldende mappe blir brukt som "
+"parameter."
-#: ../src/application.c:98
-msgid "- Tag and rename audio files"
-msgstr "- Gi tagger og nytt navn til lydfiler"
+#: ../data/browser.ui.h:4 ../src/browser.c:3794 ../src/tag_area.c:1490
+msgid "_Open"
+msgstr "_Åpne"
-#.
-#. * Main Menu Actions
-#.
-#: ../src/bar.c:155
-msgid "_File"
-msgstr "_Fil"
+#: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
+#: ../src/application_window.c:324 ../src/application_window.c:338
+#: ../src/application_window.c:2675 ../src/application_window.c:2713
+#: ../src/browser.c:870 ../src/browser.c:3793 ../src/cddb_dialog.c:2304
+#: ../src/easytag.c:475 ../src/easytag.c:482 ../src/easytag.c:607
+#: ../src/playlist_dialog.c:668 ../src/tag_area.c:1488 ../src/tag_area.c:1838
+msgid "_Cancel"
+msgstr "_Avbryt"
-#: ../src/bar.c:156
-msgid "Sort List by Tag"
-msgstr "Sorter liste etter tagg"
+#: ../data/browser.ui.h:6
+msgid "_Execute"
+msgstr "_Kjør"
-#: ../src/bar.c:159
-msgid "Sort List by Property"
-msgstr "Sorter liste etter egenskap"
+#: ../data/browser.ui.h:7
+msgid "Open Files With"
+msgstr "Åpne filer med"
-#: ../src/bar.c:160
-msgid "Ascending by filename"
-msgstr "Stigende rekkefølge, etter filnavn"
+#: ../data/browser.ui.h:8
+msgid ""
+"Enter the program to run; it will receive the current files as a parameter"
+msgstr ""
+"Skriv inn navn på programmet som skal kjøres. Gjeldende fil blir brukt som "
+"parameter."
-#: ../src/bar.c:161
-msgid "Descending by filename"
-msgstr "Synkende rekkefølge, etter filnavn"
+#. Only directories changed
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:573
+msgid "Rename Directory"
+msgstr "Gi nytt navn til mappe"
-#: ../src/bar.c:162
-msgid "Ascending by creation date"
-msgstr "Stigende, etter opprettelsesdato"
+#: ../data/browser.ui.h:10
+msgid "Literal name:"
+msgstr "Bokstavelig navn:"
-#: ../src/bar.c:163
-msgid "Descending by creation date"
-msgstr "Synkende, etter opprettelsesdato"
+#: ../data/browser.ui.h:11 ../data/playlist_dialog.ui.h:2
+msgid "Use mask:"
+msgstr "Bruk maske:"
-#: ../src/bar.c:164
-msgid "Ascending by track number"
-msgstr "Stigende, etter spornummer"
+#: ../data/browser.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:188
+msgid "Whether to use a mask when renaming directories"
+msgstr "Om en maske skal brukes når mapper får nytt navn"
-#: ../src/bar.c:165
-msgid "Descending by track number"
-msgstr "Synkende, etter spornummer"
+#: ../data/browser.ui.h:13
+msgid ""
+"Select or type in a mask using codes (see Legend in Scanner Window) to "
+"rename the directory from tag fields"
+msgstr ""
+"Velg eller skriv inn en maske ved å bruke koder (se Forklaring i "
+"skannervinduet) for å gi mappen nytt navn i henhold til taggfeltene."
-#: ../src/bar.c:166
-msgid "Ascending by title"
-msgstr "Stigende, etter tittel"
+#: ../data/browser.ui.h:14
+msgid "Rename directory preview"
+msgstr "Forhåndsvis nytt mappenavn"
-#: ../src/bar.c:167
-msgid "Descending by title"
-msgstr "Synkende, etter tittel"
+#: ../data/browser.ui.h:15
+msgid "_Rename"
+msgstr "_Gi nytt navn"
-#: ../src/bar.c:168
-msgid "Ascending by artist"
-msgstr "Stigende, etter artist"
+#: ../data/browser.ui.h:16
+msgid "Choose a directory to show in the browser"
+msgstr "Velg en mappe som skal vises i utforskeren"
-#: ../src/bar.c:169
-msgid "Descending by artist"
-msgstr "Synkende, etter artist"
+#: ../data/browser.ui.h:17 ../src/application.c:130
+msgid "Select a directory to browse"
+msgstr "Velg en mappe som skal utforskes"
-#: ../src/bar.c:170
-msgid "Ascending by album artist"
-msgstr "Stigende, etter albumartist"
+#: ../data/browser.ui.h:18 ../src/easytag.c:1080
+msgid "No files"
+msgstr "Ingen filer"
-#: ../src/bar.c:171
-msgid "Descending by album artist"
-msgstr "Synkende, etter albumartist"
+#: ../data/browser.ui.h:19 ../data/cddb_dialog.ui.h:10
+#: ../data/preferences_dialog.ui.h:63 ../data/scan_dialog.ui.h:57
+#: ../data/search_dialog.ui.h:13
+msgid "Artist"
+msgstr "Artist"
-#: ../src/bar.c:172
-msgid "Ascending by album"
-msgstr "Stigende, etter album"
+#: ../data/browser.ui.h:20
+msgid "# Albums"
+msgstr "# album"
-#: ../src/bar.c:173
-msgid "Descending by album"
-msgstr "Synkende, etter album"
+#: ../data/browser.ui.h:21
+msgid "# Files"
+msgstr "# filer"
-#: ../src/bar.c:174
-msgid "Ascending by year"
-msgstr "Stigende, etter år"
+#: ../data/browser.ui.h:22 ../data/cddb_dialog.ui.h:11
+#: ../data/preferences_dialog.ui.h:65 ../data/scan_dialog.ui.h:60
+#: ../data/search_dialog.ui.h:15
+msgid "Album"
+msgstr "Album"
-#: ../src/bar.c:175
-msgid "Descending by year"
-msgstr "år"
+#: ../data/browser.ui.h:23 ../data/cddb_dialog.ui.h:35
+#: ../data/playlist_dialog.ui.h:1 ../data/scan_dialog.ui.h:53
+#: ../data/search_dialog.ui.h:11
+msgid "Filename"
+msgstr "Filnavn"
-#: ../src/bar.c:176
-msgid "Ascending by genre"
-msgstr "Stigende, etter sjanger"
+#: ../data/browser.ui.h:24 ../data/cddb_dialog.ui.h:36
+#: ../data/preferences_dialog.ui.h:61 ../data/scan_dialog.ui.h:55
+#: ../data/search_dialog.ui.h:12
+msgid "Title"
+msgstr "Tittel"
-#: ../src/bar.c:177
-msgid "Descending by genre"
-msgstr "Synkende, etter sjanger"
+#: ../data/browser.ui.h:25 ../data/scan_dialog.ui.h:59
+#: ../data/search_dialog.ui.h:14
+msgid "Album Artist"
+msgstr "Albumartist"
-#: ../src/bar.c:178
-msgid "Ascending by comment"
-msgstr "Stigende, etter kommentar"
+#: ../data/browser.ui.h:26 ../data/cddb_dialog.ui.h:37
+#: ../data/search_dialog.ui.h:17
+msgid "Year"
+msgstr "År"
-#: ../src/bar.c:179
-msgid "Descending by comment"
-msgstr "Synkende, etter kommentar"
+#: ../data/browser.ui.h:27
+msgid "Disc"
+msgstr "Plate"
-#: ../src/bar.c:180
-msgid "Ascending by composer"
-msgstr "Stigende, etter komponist"
+#: ../data/browser.ui.h:28 ../data/search_dialog.ui.h:18
+msgid "Track"
+msgstr "Spor"
-#: ../src/bar.c:181
-msgid "Descending by composer"
-msgstr "Synkende, etter komponist"
+#: ../data/browser.ui.h:29 ../data/cddb_dialog.ui.h:40
+#: ../data/preferences_dialog.ui.h:67 ../data/scan_dialog.ui.h:62
+#: ../data/search_dialog.ui.h:19
+msgid "Genre"
+msgstr "Sjanger"
-#: ../src/bar.c:182
-msgid "Ascending by original artist"
-msgstr "Stigende, etter opprinnelig artist"
+#: ../data/browser.ui.h:30 ../data/preferences_dialog.ui.h:69
+#: ../data/scan_dialog.ui.h:64 ../data/search_dialog.ui.h:20
+msgid "Comment"
+msgstr "Kommentar"
-#: ../src/bar.c:183
-msgid "Descending by original artist"
-msgstr "Synkende, etter opprinnelig artist"
+#: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71
+#: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
+#: ../src/picture.c:214
+msgid "Composer"
+msgstr "Komponist"
-#: ../src/bar.c:184
-msgid "Ascending by copyright"
-msgstr "Stigende, etter opphavsrett"
+#: ../data/browser.ui.h:32 ../data/search_dialog.ui.h:22
+msgid "Original Artist"
+msgstr "Opprinnelig artist"
-#: ../src/bar.c:185
-msgid "Descending by copyright"
-msgstr "Synkende, etter opphavsrett"
+#: ../data/browser.ui.h:33 ../data/scan_dialog.ui.h:70
+#: ../data/search_dialog.ui.h:23
+msgid "Copyright"
+msgstr "Opphavsrett"
-#: ../src/bar.c:186
-msgid "Ascending by URL"
-msgstr "Stigende, etter nettadresse"
+#: ../data/browser.ui.h:34 ../data/scan_dialog.ui.h:72
+#: ../data/search_dialog.ui.h:24
+msgid "URL"
+msgstr "Nettadresse"
-#: ../src/bar.c:187
-msgid "Descending by URL"
-msgstr "Synkende, etter nettadresse"
+#: ../data/browser.ui.h:35 ../data/scan_dialog.ui.h:74
+#: ../data/search_dialog.ui.h:25
+msgid "Encoded By"
+msgstr "Kodet av"
-#. Translators: the encoder name is supposed to be the name of a person
-#. * or organisation, but can sometimes be the name of an application.
-#: ../src/bar.c:190
-msgid "Ascending by encoder name"
-msgstr "Stigende, etter kodeprogram"
+#: ../data/cddb_dialog.ui.h:1
+msgid "Search"
+msgstr "Søk"
-#. Translators: the encoder name is supposed to be the name of a person
-#. * or organisation, but can sometimes be the name of an application.
-#: ../src/bar.c:193
-msgid "Descending by encoder name"
-msgstr "Synkende, etter kodeprogram"
+#: ../data/cddb_dialog.ui.h:2
+msgid "Enter the words to search (separated by a space or ‘+’)"
+msgstr "Skriv inn ordene du vil søke etter (adskilt med mellomrom eller «+»)"
-#: ../src/bar.c:194
-msgid "Ascending by file type"
-msgstr "Stigende, etter filtype"
+#: ../data/cddb_dialog.ui.h:3
+msgid "_Search"
+msgstr "_Søk:"
-#: ../src/bar.c:195
-msgid "Descending by file type"
-msgstr "Synkende, etter filtype"
+#: ../data/cddb_dialog.ui.h:4
+msgid "Search Using Selected _Files"
+msgstr "Søk ved bruk av valgte filer"
-#: ../src/bar.c:196
-msgid "Ascending by file size"
-msgstr "Stigende, etter filstørrelse"
+#: ../data/cddb_dialog.ui.h:5
+msgid ""
+"Generate the CDDB disc ID using the selected files (the order is important)"
+msgstr "Lag plate-ID for CDDB ved å bruke valgte filer (rekkefølge er viktig)"
-#: ../src/bar.c:197
-msgid "Descending by file size"
-msgstr "Synkende, etter filstørrelse"
+#: ../data/cddb_dialog.ui.h:6 ../data/toolbar.ui.h:31
+msgid "Stop"
+msgstr "Stopp"
-#: ../src/bar.c:198
-msgid "Ascending by duration"
-msgstr "Stigende, etter varighet"
+#: ../data/cddb_dialog.ui.h:7
+msgid "Stop the search"
+msgstr "Avbryt søket"
-#: ../src/bar.c:199
-msgid "Descending by duration"
-msgstr "Synkende, etter varighet"
+#: ../data/cddb_dialog.ui.h:8
+msgid "Manual Search Options"
+msgstr "Valg for manuelt søk"
-#: ../src/bar.c:200
-msgid "Ascending by bitrate"
-msgstr "Stigende, etter bitfrekvens"
+#: ../data/cddb_dialog.ui.h:9
+msgid "Search Fields"
+msgstr "Søk gjennom felt"
-#: ../src/bar.c:201
-msgid "Descending by bitrate"
-msgstr "Synkende, etter bitfrekvens"
+#: ../data/cddb_dialog.ui.h:12
+msgid "Track Name"
+msgstr "Spornavn"
-#: ../src/bar.c:202
-msgid "Ascending by samplerate"
-msgstr "Stigende, etter sample-frekvens"
+#: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91
+#: ../src/picture.c:192
+msgid "Other"
+msgstr "Annet"
-#: ../src/bar.c:203
-msgid "Descending by samplerate"
-msgstr "Synkende, etter sample-frekvens"
+#: ../data/cddb_dialog.ui.h:14
+msgid "Categories"
+msgstr "Kategorier"
-#: ../src/bar.c:205
-msgid "Open Files With…"
-msgstr "Åpne filer med …"
+#: ../data/cddb_dialog.ui.h:15
+msgid "Blues"
+msgstr "Blues"
-#: ../src/bar.c:206
-msgid "Run a command on the selected files"
-msgstr "Kjør valgte filer gjennom en kommando"
+#: ../data/cddb_dialog.ui.h:16
+msgid "Classical"
+msgstr "Klassisk"
-#: ../src/bar.c:209
-msgid "Select all"
-msgstr "Velg alle"
+#: ../data/cddb_dialog.ui.h:17
+msgid "Country"
+msgstr "Land"
-#: ../src/bar.c:210
-msgid "Unselect All"
-msgstr "Velg bort alle"
+#: ../data/cddb_dialog.ui.h:18
+msgid "Folk"
+msgstr "Folk"
-#: ../src/bar.c:211
-msgid "Clear the current selection"
-msgstr "Tøm utvalget"
+#: ../data/cddb_dialog.ui.h:19
+msgid "Jazz"
+msgstr "Jazz"
-#: ../src/bar.c:214
-msgid "Invert File Selection"
-msgstr "Inverter filutvalg"
+#: ../data/cddb_dialog.ui.h:20
+msgid "Misc."
+msgstr "Div."
-#: ../src/bar.c:215
-msgid "Invert file selection"
-msgstr "Inverter filutvalg"
+#: ../data/cddb_dialog.ui.h:21
+msgid "New Age"
+msgstr "New Age"
-#: ../src/bar.c:217
-msgid "Delete Files"
-msgstr "Slett filer"
+#: ../data/cddb_dialog.ui.h:22
+msgid "Reggae"
+msgstr "Reggae"
-#: ../src/bar.c:217
-msgid "Delete files"
-msgstr "Slett filer"
+#: ../data/cddb_dialog.ui.h:23
+msgid "Rock"
+msgstr "Rock"
-#: ../src/bar.c:218
-msgid "_First File"
-msgstr "_Første fil"
+#: ../data/cddb_dialog.ui.h:24
+msgid "Soundtrack"
+msgstr "Soundtrack"
-#: ../src/bar.c:219
-msgid "First file"
-msgstr "Første fil"
+#: ../data/cddb_dialog.ui.h:25
+msgid "Results"
+msgstr "Søkeresultater"
-#: ../src/bar.c:220
-msgid "_Previous File"
-msgstr "_Forrige fil"
+#: ../data/cddb_dialog.ui.h:26
+msgid "Artist / Album"
+msgstr "Artist / album"
-#: ../src/bar.c:220
-msgid "Previous file"
-msgstr "Forrige fil"
+#: ../data/cddb_dialog.ui.h:27
+msgid "Category"
+msgstr "Kategori"
-#: ../src/bar.c:221
-msgid "_Next File"
-msgstr "_Neste fil"
+#: ../data/cddb_dialog.ui.h:28
+msgid ""
+"Select lines from which tags will be applied to your files list. All lines "
+"will be processed if no line is selected.\\nYou can also reorder lines in "
+"this list before using the ‘apply’ button"
+msgstr ""
+"Velg hvilke linjer som skal «brukes» på fillista. Alle linjer blir behandlet "
+"hvis du ikke velger noen linjer.\n"
+"Du kan også omsortere linjer på denne lista før du trykker på «bruk»"
-#: ../src/bar.c:221
-msgid "Next file"
-msgstr "Neste fil"
+#: ../data/cddb_dialog.ui.h:29
+msgid "#"
+msgstr "#"
-#: ../src/bar.c:222
-msgid "_Last File"
-msgstr "_Siste fil"
+#: ../data/cddb_dialog.ui.h:30
+msgid "Duration"
+msgstr "Varighet"
-#: ../src/bar.c:223
-msgid "Last file"
-msgstr "Siste fil"
+#: ../data/cddb_dialog.ui.h:31
+msgid "Select all lines"
+msgstr "Velg alle linjer"
-#: ../src/bar.c:224
-msgid "S_can Files"
-msgstr "S_øk gjennom filer"
+#: ../data/cddb_dialog.ui.h:32
+msgid "Invert line selection"
+msgstr "Inverter linjeutvalg"
-#: ../src/bar.c:225 ../src/scan_dialog.c:1818
-msgid "Scan selected files"
-msgstr "Søk gjennom valgte filer"
+#: ../data/cddb_dialog.ui.h:33
+msgid "Unselect all lines"
+msgstr "Velg bort alle linjer"
-#: ../src/bar.c:226
-msgid "_Remove Tags"
-msgstr "_Fjern tagger"
+#: ../data/cddb_dialog.ui.h:34 ../data/menus.ui.h:24
+msgid "Fill Tags"
+msgstr "Fyll ut tagger"
-#: ../src/bar.c:227
-msgid "Remove tags"
-msgstr "Fjern tagger"
+#: ../data/cddb_dialog.ui.h:38
+msgid "Track #"
+msgstr "Spor #"
-#: ../src/bar.c:228
-msgid "_Undo Last Files Changes"
-msgstr "_Angre siste filendringer"
+#: ../data/cddb_dialog.ui.h:39
+msgid "# Tracks"
+msgstr "# spor"
-#: ../src/bar.c:229
-msgid "Undo last files changes"
-msgstr "Angre siste filendringer"
+#: ../data/cddb_dialog.ui.h:41 ../data/load_files_dialog.ui.h:13
+msgid "Run the current scanner for each file"
+msgstr "Kjør gjeldende skanner på hver fil"
-#: ../src/bar.c:231
-msgid "R_edo Last Files Changes"
-msgstr "G_jør om siste filendringer"
+#: ../data/cddb_dialog.ui.h:42 ../data/org.gnome.EasyTAG.gschema.xml.h:38
+msgid ""
+"Whether to run the tag scanner, with the current settings, on the CDDB "
+"results"
+msgstr ""
+"Om taggskanneren skal kjøres med gjeldende oppsett på CDDB-søkeresultater"
-#: ../src/bar.c:232
-msgid "Redo last files changes"
-msgstr "Gjør om siste filendringer"
-
-#: ../src/bar.c:234
-msgid "_Save Files"
-msgstr "_Lagre filer"
-
-#: ../src/bar.c:235
-msgid "Save changes to selected files"
-msgstr "Lagre endringer i valgte filer"
-
-#: ../src/bar.c:237
-msgid "_Force Save Files"
-msgstr "_Tvungen lagring av filer"
+#: ../data/cddb_dialog.ui.h:43
+msgid "Match lines with the Levenshtein algorithm"
+msgstr "Finn linjer som passer sammen med Levenshtein-algoritmen"
-#: ../src/bar.c:238
-msgid "Force saving files"
-msgstr "Tvungen lagring av filer"
+#: ../data/cddb_dialog.ui.h:44 ../data/preferences_dialog.ui.h:148
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:24
+msgid "Whether to use the DLM algorithm to match CDDB results to files"
+msgstr ""
+"Om DLM-algoritmen skal brukes for å finne CDDB-søkeresultater som passer med "
+"aktuelle filer"
+
+#: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
+#: ../src/load_files_dialog.c:900 ../src/preferences_dialog.c:291
+#: ../src/scan_dialog.c:2309
+msgid "_Close"
+msgstr "_Lukk"
+
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2305
+#: ../src/load_files_dialog.c:901
+msgid "_Apply"
+msgstr "_Bruk"
+
+#: ../data/cddb_dialog.ui.h:47
+msgid "Load the selected lines or all lines (if no lines are selected)"
+msgstr "Last inn valgte linjer, evt. alle linjer hvis ingen er valgt."
-#: ../src/bar.c:240
-msgid "Undo Last Changes"
-msgstr "Angre siste endringer"
+#. Default values are MPEG data.
+#: ../data/file_area.ui.h:1 ../src/file_area.c:196 ../src/file.c:1247
+msgid "File"
+msgstr "Fil"
-#: ../src/bar.c:240
-msgid "Undo last changes"
-msgstr "Angre siste endringer"
+#: ../data/file_area.ui.h:2
+msgid "0/0:"
+msgstr "0/0:"
-#: ../src/bar.c:241
-msgid "Redo Last Changes"
-msgstr "Gjør om siste endringer"
+#. Nothing to display
+#. Version changed to encoder version
+#. Encoder version
+#: ../data/file_area.ui.h:3 ../src/file_area.c:197
+#: ../src/tags/flac_header.c:168 ../src/tags/monkeyaudio_header.c:88
+#: ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:399
+#: ../src/tags/opus_header.c:226 ../src/tags/wavpack_header.c:141
+msgid "Encoder:"
+msgstr "Kodeprogram:"
-#: ../src/bar.c:241
-msgid "Redo last changes"
-msgstr "Gjør om siste endringer"
+#: ../data/file_area.ui.h:4
+msgid "Bitrate:"
+msgstr "Bitfrekvens:"
-#: ../src/bar.c:242
-msgid "_Quit"
-msgstr "_Avslutt"
+#: ../data/file_area.ui.h:5
+msgid "Sample rate:"
+msgstr "Samplefrekvens:"
-#: ../src/bar.c:242 ../src/easytag.c:2428 ../src/easytag.c:4617
-#: ../src/easytag.c:4649
-msgid "Quit"
-msgstr "Avslutt"
+#. Mode
+#: ../data/file_area.ui.h:6 ../src/file_area.c:201
+#: ../src/tags/mpeg_header.c:260
+msgid "Mode:"
+msgstr "Modus:"
-#: ../src/bar.c:245
-msgid "_Browser"
-msgstr "_Filutforsker"
+#: ../data/file_area.ui.h:7
+msgid "Size:"
+msgstr "Størrelse:"
-#: ../src/bar.c:246
-msgid "_Home Directory"
-msgstr "_Hjemmemappe"
+#: ../data/file_area.ui.h:8
+msgid "Duration:"
+msgstr "Varighet:"
-#: ../src/bar.c:247
-msgid "Go to home directory"
-msgstr "Gå til hjemmemappe"
+#: ../data/log_area.ui.h:1 ../data/preferences_dialog.ui.h:14
+msgid "Log"
+msgstr "Logg"
-#: ../src/bar.c:249
-msgid "Desktop Directory"
-msgstr "Skrivebordsmappe"
+#: ../data/load_files_dialog.ui.h:1
+msgid "File:"
+msgstr "Fil:"
-#: ../src/bar.c:250
-msgid "Go to desktop directory"
-msgstr "Gå til skrivebordsmappa"
+#: ../data/load_files_dialog.ui.h:2
+msgid "Choose a Text File"
+msgstr "Velg en tekstfil"
-#: ../src/bar.c:252
-msgid "Documents Directory"
-msgstr "Dokumentmappe"
+#: ../data/load_files_dialog.ui.h:3
+msgid "_Load"
+msgstr "_Last inn"
-#: ../src/bar.c:253
-msgid "Go to documents directory"
-msgstr "Gå til dokumentmappa"
+#: ../data/load_files_dialog.ui.h:4
+msgid "Content of Text File"
+msgstr "Innhold i tekstfil"
-#: ../src/bar.c:255
-msgid "Downloads Directory"
-msgstr "Nedlastinger-mappe"
+#: ../data/load_files_dialog.ui.h:5
+msgid "Insert a blank line before the selected line"
+msgstr "Sett inn en tom linje før valgt linje"
-#: ../src/bar.c:256
-msgid "Go to downloads directory"
-msgstr "Gå til nedlastingsmappa"
+#: ../data/load_files_dialog.ui.h:6
+msgid "Delete the selected line"
+msgstr "Slett valgt linje"
-#: ../src/bar.c:258
-msgid "Music Directory"
-msgstr "Musikkmappe"
+#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:641
+#: ../src/load_files_dialog.c:744
+msgid "Delete all blank lines"
+msgstr "Slett alle tomme linjer"
-#: ../src/bar.c:259
-msgid "Go to music directory"
-msgstr "Gå til musikkmappa"
+#: ../data/load_files_dialog.ui.h:8
+msgid "Move the selected line up"
+msgstr "Flytt valgt linje opp"
-#: ../src/bar.c:261
-msgid "_Parent Directory"
-msgstr "_Foreldermappe"
+#: ../data/load_files_dialog.ui.h:9
+msgid "Move the selected line down"
+msgstr "Flytt valgt linje ned"
-#: ../src/bar.c:262
-msgid "Go to parent directory"
-msgstr "Gå til foreldermappe"
+#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:659
+#: ../src/load_files_dialog.c:762
+msgid "Reload"
+msgstr "Last inn på nytt"
-#: ../src/bar.c:264
-msgid "_Default Directory"
-msgstr "_Standardmappe"
+#: ../data/load_files_dialog.ui.h:11
+msgid "List of Files"
+msgstr "Liste over filer"
-#: ../src/bar.c:265
-msgid "Go to default directory"
-msgstr "Gå til standardmappa"
+#: ../data/load_files_dialog.ui.h:12
+msgid "Selected line:"
+msgstr "Valgt linje:"
-#: ../src/bar.c:267
-msgid "Set _Current Path as Default"
-msgstr "Bruk _gjeldende filsti som standard"
+#: ../data/load_files_dialog.ui.h:14
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:131
+msgid "Whether to run the current scanner on files loaded from a text file"
+msgstr ""
+"Om gjeldende skanenr skal kjøres på filer som lastes inn fra en tekstfil"
-#: ../src/bar.c:267
-msgid "Set current path as default"
-msgstr "Bruk gjeldende filsti som standard"
+#: ../data/menus.ui.h:1
+msgid "_Help"
+msgstr "_Hjelp"
-#: ../src/bar.c:268
-msgid "Rename Directory…"
-msgstr "Gi nytt navn til mappe …"
+#: ../data/menus.ui.h:2
+msgid "_About"
+msgstr "_Om"
-#: ../src/bar.c:268
-msgid "Rename directory"
-msgstr "Gi nytt navn til mappe"
+#: ../data/menus.ui.h:3 ../src/application_window.c:2714
+msgid "_Quit"
+msgstr "_Avslutt"
-#: ../src/bar.c:269
-msgid "Reload Directory"
-msgstr "Last inn mappa på nytt"
+#: ../data/menus.ui.h:4
+msgid "_File"
+msgstr "_Fil"
-#: ../src/bar.c:270
-msgid "Reload directory"
-msgstr "Last inn mappa på nytt"
+#: ../data/menus.ui.h:5
+msgid "Open Files With…"
+msgstr "Åpne filer med …"
-#: ../src/bar.c:273
-msgid "Browse Directory With…"
-msgstr "Utforsk mappa med …"
+#: ../data/menus.ui.h:6
+msgid "Run Audio Player"
+msgstr "Kjør lydavspiller"
-#: ../src/bar.c:274
-msgid "Run a command on the directory"
-msgstr "Kjør en kommando i mappa"
+#: ../data/menus.ui.h:7 ../data/toolbar.ui.h:23
+msgid "Invert File Selection"
+msgstr "Inverter filutvalg"
-#: ../src/bar.c:276
-msgid "_Collapse Tree"
-msgstr "_Fold sammen trevisninga"
+#: ../data/menus.ui.h:8
+msgid "Delete Files"
+msgstr "Slett filer"
-#: ../src/bar.c:277
-msgid "Collapse directory tree"
-msgstr "Fold sammen mappetreet"
+#: ../data/menus.ui.h:9
+msgid "Undo for File"
+msgstr "Angre filhandling"
-#: ../src/bar.c:278
-msgid "_Reload Tree"
-msgstr "_Last inn treet på nytt"
+#: ../data/menus.ui.h:10
+msgid "Redo for File"
+msgstr "Gjenta på fil"
-#: ../src/bar.c:279
-msgid "Reload directory tree"
-msgstr "Last inn mappetreet på nytt"
+#: ../data/menus.ui.h:11 ../data/toolbar.ui.h:17
+msgid "_Save Files"
+msgstr "_Lagre filer"
-#: ../src/bar.c:282
-msgid "S_canner Mode"
-msgstr "S_kannermodus"
+#: ../data/menus.ui.h:12
+msgid "_Force Save Files"
+msgstr "_Tvungen lagring av filer"
-#: ../src/bar.c:284
-msgid "_Miscellaneous"
-msgstr "_Diverse"
+#: ../data/menus.ui.h:13
+msgid "_Edit"
+msgstr "_Rediger"
-#: ../src/bar.c:285
+#: ../data/menus.ui.h:14 ../data/toolbar.ui.h:25
msgid "_Find…"
msgstr "_Finn …"
-#: ../src/bar.c:286
-msgid "Search filenames and tags"
-msgstr "Søk i filnavn og tagger"
-
-#: ../src/bar.c:288
-msgid "CDD_B Search…"
-msgstr "CDD_B-søk …"
-
-#: ../src/bar.c:289
-msgid "CDDB search"
-msgstr "CDDB-søk …"
-
-#: ../src/bar.c:291
-msgid "Load Filenames From a Text File…"
-msgstr "Last inn filnavn fra en tekstfil …"
-
-#: ../src/bar.c:292
-msgid "Load filenames from a text file"
-msgstr "Last inn filnavn fra en tekstfil"
-
-#: ../src/bar.c:294
-msgid "Generate Playlist…"
-msgstr "Lag en spilleliste …"
+#: ../data/menus.ui.h:15
+msgid "Select All"
+msgstr "Velg alle"
-#: ../src/bar.c:295
-msgid "Generate a playlist"
-msgstr "Lag en spilleliste"
+#: ../data/menus.ui.h:16
+msgid "Unselect All"
+msgstr "Velg bort alle"
-#: ../src/bar.c:297 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
-msgid "Run Audio Player"
-msgstr "Kjør lydavspiller"
+#: ../data/menus.ui.h:17
+msgid "Undo"
+msgstr "Angre"
-#: ../src/bar.c:298 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
-msgid "Run audio player"
-msgstr "Kjør lydavspiller"
+#: ../data/menus.ui.h:18
+msgid "Redo"
+msgstr "Gjør om"
-#: ../src/bar.c:301
-msgid "_Edit"
-msgstr "_Rediger"
+#: ../data/menus.ui.h:19 ../data/toolbar.ui.h:11
+msgid "_Remove Tags"
+msgstr "_Fjern tagger"
-#: ../src/bar.c:302
+#: ../data/menus.ui.h:20
msgid "_Preferences"
msgstr "_Innstillinger"
-#. The window
-#: ../src/bar.c:303 ../src/prefs.c:110
-msgid "Preferences"
-msgstr "Innstillinger"
-
-#: ../src/bar.c:305
+#: ../data/menus.ui.h:21
msgid "_View"
msgstr "_Vis"
-#: ../src/bar.c:306
-msgid "_Go"
-msgstr "_Gå"
+#: ../data/menus.ui.h:22
+msgid "Show Scanner"
+msgstr "Vis skanner"
-#: ../src/bar.c:308
-msgid "_Help"
-msgstr "_Hjelp"
+#: ../data/menus.ui.h:23
+msgid "Scanner Mode"
+msgstr "Skannermodus"
-#: ../src/bar.c:311
-msgid "_Contents"
-msgstr "_Innhold"
+#: ../data/menus.ui.h:25
+msgid "Rename Files and Directories"
+msgstr "Endre navn på filer og mapper"
-#: ../src/bar.c:312
-msgid "Show help"
-msgstr "Vis hjelp"
+#: ../data/menus.ui.h:26 ../data/scan_dialog.ui.h:107
+msgid "Process Fields"
+msgstr "Behandle felt"
-#: ../src/bar.c:314
-msgid "_About"
-msgstr "_Om"
+#: ../data/menus.ui.h:27 ../data/toolbar.ui.h:19
+msgid "Directory Tree"
+msgstr "Mappetre"
-#: ../src/bar.c:314
-msgid "About"
-msgstr "Om"
+#: ../data/menus.ui.h:28 ../data/toolbar.ui.h:21
+msgid "Artists and Albums"
+msgstr "Artister og album"
-#.
-#. * Following items are on toolbar but not on menu
-#.
-#: ../src/bar.c:320
-msgid "Stop the current action"
-msgstr "Avbryt pågående handling"
+#: ../data/menus.ui.h:29
+msgid "Sort List by Tag"
+msgstr "Sorter liste etter tagg"
-#.
-#. * Popup menu's Actions
-#.
-#: ../src/bar.c:326
-msgid "_File Operations"
-msgstr "_Filhandlinger"
+#: ../data/menus.ui.h:30
+msgid "Ascending by track number"
+msgstr "Stigende, etter spornummer"
-#: ../src/bar.c:327
-msgid "S_canner"
-msgstr "S_kanner"
+#: ../data/menus.ui.h:31
+msgid "Descending by track number"
+msgstr "Synkende, etter spornummer"
-#: ../src/bar.c:331
-msgid "CDDB Search Files…"
-msgstr "Søk etter filene på CDDB …"
+#: ../data/menus.ui.h:32
+msgid "Ascending by title"
+msgstr "Stigende, etter tittel"
-#: ../src/bar.c:331
-msgid "CDDB search files…"
-msgstr "Søk etter filene på CDDB …"
+#: ../data/menus.ui.h:33
+msgid "Descending by title"
+msgstr "Synkende, etter tittel"
-#. { AM_ARTIST_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open File(s) with…"), NULL, _("Open File(s) with…"), G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#. { AM_ALBUM_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open File(s) with…"), NULL, _("Open File(s) with…"), G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:335
-msgid "Clear log"
-msgstr "Tøm logg"
+#: ../data/menus.ui.h:34
+msgid "Ascending by artist"
+msgstr "Stigende, etter artist"
-#. { AM_BROWSE_SUBDIR, GTK_STOCK_INDEX, _("Browse _Subdirectories"), NULL, _("Browse _Sub-directories"), NULL, FALSE },
-#: ../src/bar.c:342
-msgid "Browse _Subdirectories"
-msgstr "Søk gjennom _undermapper"
+#: ../data/menus.ui.h:35
+msgid "Descending by artist"
+msgstr "Synkende, etter artist"
-#: ../src/bar.c:342
-msgid "Browse subdirectories"
-msgstr "Søk gjennom undermapper"
+#: ../data/menus.ui.h:36
+msgid "Ascending by album artist"
+msgstr "Stigende, etter albumartist"
-#: ../src/bar.c:346
-msgid "Show Hidden Directories"
-msgstr "Vis skjulte mapper"
+#: ../data/menus.ui.h:37
+msgid "Descending by album artist"
+msgstr "Synkende, etter albumartist"
-#: ../src/bar.c:346
-msgid "Show hidden directories"
-msgstr "Vis skjulte mapper"
+#: ../data/menus.ui.h:38
+msgid "Ascending by album"
+msgstr "Stigende, etter album"
-#: ../src/bar.c:348
-msgid "_Show Scanner"
-msgstr "_Vis skanner"
+#: ../data/menus.ui.h:39
+msgid "Descending by album"
+msgstr "Synkende, etter album"
-#: ../src/bar.c:349
-msgid "Show scanner"
-msgstr "Vis skanner"
+#: ../data/menus.ui.h:40
+msgid "Ascending by year"
+msgstr "Stigende, etter år"
-#: ../src/bar.c:355
-msgid "Tree Browser"
-msgstr "Trevisning"
+#: ../data/menus.ui.h:41
+msgid "Descending by year"
+msgstr "år"
-#: ../src/bar.c:356
-msgid "View by directory tree"
-msgstr "Vis etter mappetre"
+#: ../data/menus.ui.h:42
+msgid "Ascending by genre"
+msgstr "Stigende, etter sjanger"
-#: ../src/bar.c:358
-msgid "Artist and Album"
-msgstr "Artist og album"
+#: ../data/menus.ui.h:43
+msgid "Descending by genre"
+msgstr "Synkende, etter sjanger"
-#: ../src/bar.c:359
-msgid "View by artist and album"
-msgstr "Vis etter artist og album"
+#: ../data/menus.ui.h:44
+msgid "Ascending by comment"
+msgstr "Stigende, etter kommentar"
-#: ../src/bar.c:364
-msgid "_Fill Tags…"
-msgstr "_Fyll inn tagger …"
+#: ../data/menus.ui.h:45
+msgid "Descending by comment"
+msgstr "Synkende, etter kommentar"
-#: ../src/bar.c:365
-msgid "Fill tags"
-msgstr "Fyll inn tagger"
+#: ../data/menus.ui.h:46
+msgid "Ascending by composer"
+msgstr "Stigende, etter komponist"
-#: ../src/bar.c:367
-msgid "_Rename Files and Directories…"
-msgstr "_Gi nytt navn til filer og mapper …"
+#: ../data/menus.ui.h:47
+msgid "Descending by composer"
+msgstr "Synkende, etter komponist"
-#: ../src/bar.c:368
-msgid "Rename files and directories"
-msgstr "Gi nytt navn til filer og mapper"
+#: ../data/menus.ui.h:48
+msgid "Ascending by original artist"
+msgstr "Stigende, etter opprinnelig artist"
-#: ../src/bar.c:370
-msgid "_Process Fields…"
-msgstr "_Behandle felt …"
+#: ../data/menus.ui.h:49
+msgid "Descending by original artist"
+msgstr "Synkende, etter opprinnelig artist"
-#: ../src/bar.c:370 ../src/scan_dialog.c:184
-msgid "Process Fields"
-msgstr "Behandle felt"
+#: ../data/menus.ui.h:50
+msgid "Ascending by copyright"
+msgstr "Stigende, etter opphavsrett"
-#: ../src/bar.c:428
-#, c-format
-msgid "Could not merge UI, error was: %s\n"
-msgstr "Klarte ikke å slå sammen UI. Feilen var: %s\n"
+#: ../data/menus.ui.h:51
+msgid "Descending by copyright"
+msgstr "Synkende, etter opphavsrett"
-#: ../src/bar.c:533
-msgid "Ready to start"
-msgstr "Klar til å begynne"
+#: ../data/menus.ui.h:52
+msgid "Ascending by URL"
+msgstr "Stigende, etter nettadresse"
-#: ../src/browser.c:376
-msgid "New default path for files selected"
-msgstr "Ny standardfilsti for filer er valgt"
+#: ../data/menus.ui.h:53
+msgid "Descending by URL"
+msgstr "Synkende, etter nettadresse"
-#: ../src/browser.c:678 ../src/easytag.c:4613
-msgid "Some files have been modified but not saved"
-msgstr "Noen filer er markert for endringer, men endringene er ikke lagret"
+#: ../data/menus.ui.h:54
+msgid "Ascending by encoder name"
+msgstr "Stigende, etter kodeprogram"
-#: ../src/browser.c:679
-msgid "Do you want to save them before changing the directory?"
-msgstr "Vil du lagre dem før du bytter mappe?"
+#: ../data/menus.ui.h:55
+msgid "Descending by encoder name"
+msgstr "Synkende, etter kodeprogram"
-#: ../src/browser.c:683
-msgid "Confirm Directory Change"
-msgstr "Bekreft hopp til annen mappe"
+#: ../data/menus.ui.h:56
+msgid "Sort List by Property"
+msgstr "Sorter liste etter egenskap"
-#: ../src/browser.c:2244
-msgid "<All albums>"
-msgstr "<Alle album>"
+#: ../data/menus.ui.h:57
+msgid "Ascending by filename"
+msgstr "Stigende rekkefølge, etter filnavn"
-#: ../src/browser.c:2707
-#, c-format
-msgid "Error: Searching for %s, could not find node %s in tree."
-msgstr "Feil: Ved søk etter «%s» ble ikke noden «%s» funnet i treet."
+#: ../data/menus.ui.h:58
+msgid "Descending by filename"
+msgstr "Synkende rekkefølge, etter filnavn"
-#: ../src/browser.c:3201 ../src/browser.c:3279
-msgid "Tree"
-msgstr "Trevisning"
+#: ../data/menus.ui.h:59
+msgid "Ascending by creation date"
+msgstr "Stigende, etter opprettelsesdato"
-#: ../src/browser.c:3202 ../src/cddb.c:803 ../src/misc.c:1903
-msgid "Filename"
-msgstr "Filnavn"
+#: ../data/menus.ui.h:60
+msgid "Descending by creation date"
+msgstr "Synkende, etter opprettelsesdato"
-#: ../src/browser.c:3202 ../src/cddb.c:804 ../src/misc.c:1904
-#: ../src/prefs.c:643
-msgid "Title"
-msgstr "Tittel"
+#: ../data/menus.ui.h:61
+msgid "Ascending by file type"
+msgstr "Stigende, etter filtype"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3203 ../src/browser.c:3210 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1905 ../src/prefs.c:644
-msgid "Artist"
-msgstr "Artist"
+#: ../data/menus.ui.h:62
+msgid "Descending by file type"
+msgstr "Synkende, etter filtype"
-#: ../src/browser.c:3203 ../src/misc.c:1906
-msgid "Album Artist"
-msgstr "Albumartist"
+#: ../data/menus.ui.h:63
+msgid "Ascending by file size"
+msgstr "Stigende, etter filstørrelse"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3204 ../src/browser.c:3212 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1907 ../src/prefs.c:645
-msgid "Album"
-msgstr "Album"
+#: ../data/menus.ui.h:64
+msgid "Descending by file size"
+msgstr "Synkende, etter filstørrelse"
-#: ../src/browser.c:3204 ../src/cddb.c:807 ../src/misc.c:1909
-msgid "Year"
-msgstr "År"
+#: ../data/menus.ui.h:65
+msgid "Ascending by duration"
+msgstr "Stigende, etter varighet"
-#: ../src/browser.c:3204
-msgid "Disc"
-msgstr "Plate"
+#: ../data/menus.ui.h:66
+msgid "Descending by duration"
+msgstr "Synkende, etter varighet"
-#: ../src/browser.c:3205 ../src/misc.c:1910
-msgid "Track"
-msgstr "Spor"
+#: ../data/menus.ui.h:67
+msgid "Ascending by bit rate"
+msgstr "Stigende, etter bitfrekvens"
-#: ../src/browser.c:3205 ../src/cddb.c:810 ../src/misc.c:1911
-#: ../src/prefs.c:646
-msgid "Genre"
-msgstr "Sjanger"
+#: ../data/menus.ui.h:68
+msgid "Descending by bit rate"
+msgstr "Synkende, etter bitfrekvens"
-#: ../src/browser.c:3206 ../src/misc.c:1912 ../src/prefs.c:647
-msgid "Comment"
-msgstr "Kommentar"
+#: ../data/menus.ui.h:69
+msgid "Ascending by sample rate"
+msgstr "Stigende, etter sample-frekvens"
-#: ../src/browser.c:3206 ../src/misc.c:1913 ../src/picture.c:884
-#: ../src/prefs.c:648
-msgid "Composer"
-msgstr "Komponist"
+#: ../data/menus.ui.h:70
+msgid "Descending by sample rate"
+msgstr "Synkende, etter sample-frekvens"
-#: ../src/browser.c:3207 ../src/misc.c:1914
-msgid "Original Artist"
-msgstr "Opprinnelig artist"
+#: ../data/menus.ui.h:71
+msgid "Collapse Tree"
+msgstr "Fold sammen tre"
-#: ../src/browser.c:3208 ../src/misc.c:1915
-msgid "Copyright"
-msgstr "Opphavsrett"
+#: ../data/menus.ui.h:72
+msgid "Reload Tree"
+msgstr "Last inn trevisning på nytt"
-#: ../src/browser.c:3208 ../src/misc.c:1916
-msgid "URL"
-msgstr "Nettadresse"
+#: ../data/menus.ui.h:73
+msgid "Reload Directory"
+msgstr "Last inn mappe på nytt"
-#: ../src/browser.c:3209 ../src/misc.c:1917
-msgid "Encoded By"
-msgstr "Kodet av"
+#: ../data/menus.ui.h:74
+msgid "Show Hidden Directories"
+msgstr "Vis skjulte mapper"
-#: ../src/browser.c:3210
-msgid "# Albums"
-msgstr "# album"
+#: ../data/menus.ui.h:75
+msgid "_Browser"
+msgstr "_Filutforsker"
-#: ../src/browser.c:3211 ../src/browser.c:3212
-msgid "# Files"
-msgstr "# filer"
+#: ../data/menus.ui.h:76
+msgid "Set _Current Path as Default"
+msgstr "Bruk _gjeldende filsti som standard"
-#: ../src/browser.c:3237
-msgid "Enter a directory to browse."
-msgstr "Skriv inn en mappe som skal utforskes."
+#: ../data/menus.ui.h:77
+msgid "Rename Directory…"
+msgstr "Gi nytt navn til mappe …"
-#: ../src/browser.c:3246
-msgid "Select a directory to browse."
-msgstr "Velg en mappe som skal utforskes."
+#: ../data/menus.ui.h:78
+msgid "Browse Directory With…"
+msgstr "Utforsk mappe med …"
-#.
-#. * The label for displaying number of files in path (without subdirs)
-#.
-#. Translators: No files, as in "0 files".
-#: ../src/browser.c:3253 ../src/easytag.c:3521
-msgid "No files"
-msgstr "Ingen filer"
+#: ../data/menus.ui.h:79
+msgid "Browse _Subdirectories"
+msgstr "Søk gjennom _undermapper"
-#: ../src/browser.c:3331
-msgid "Artist & Album"
-msgstr "Artist & album"
+#: ../data/menus.ui.h:80
+msgid "_Miscellaneous"
+msgstr "_Diverse"
-#. Only directories changed
-#: ../src/browser.c:3696 ../src/easytag.c:2879
-msgid "Rename Directory"
-msgstr "Gi nytt navn til mappa"
+#: ../data/menus.ui.h:81
+msgid "CDD_B Search…"
+msgstr "CDD_B-søk …"
-#: ../src/browser.c:3718
-#, c-format
-msgid "Rename the directory '%s' to:"
-msgstr "Endre navnet på mappa «%s» til:"
+#: ../data/menus.ui.h:82
+msgid "Load Filenames From a Text File…"
+msgstr "Last inn filnavn fra en tekstfil …"
-#: ../src/browser.c:3737 ../src/misc.c:1172
-msgid "Use mask:"
-msgstr "Bruk maske:"
+#: ../data/menus.ui.h:83 ../data/toolbar.ui.h:29
+msgid "Generate Playlist…"
+msgstr "Lag en spilleliste …"
-#: ../src/browser.c:3740
-msgid "If activated, it will use masks to rename directory."
-msgstr "Hvis dette er aktivert, får mappa nytt navn i henhold til en maske."
+#: ../data/menus.ui.h:84
+msgid "_Go"
+msgstr "_Gå"
-#: ../src/browser.c:3758
-msgid ""
-"Select or type in a mask using codes (see Legend in Scanner Window) to "
-"rename the directory from tag fields."
-msgstr ""
-"Velg eller skriv inn en maske ved å bruke koder (se Forklaring i "
-"skannervinduet) for å gi mappa nytt navn i henhold til taggefeltene."
+#: ../data/menus.ui.h:85
+msgid "_Home Directory"
+msgstr "_Hjemmemappe"
-#. Preview label
-#: ../src/browser.c:3782
-msgid "Rename directory preview"
-msgstr "Forhåndsvis nytt mappenavn"
+#: ../data/menus.ui.h:86
+msgid "Desktop Directory"
+msgstr "Skrivebordsmappe"
-#: ../src/browser.c:3874
-msgid "You must type a directory name"
-msgstr "Du må skrive inn et mappenavn"
+#: ../data/menus.ui.h:87
+msgid "Documents Directory"
+msgstr "Dokumentmappe"
-#: ../src/browser.c:3875 ../src/browser.c:3896
-msgid "Directory Name Error"
-msgstr "Feil i mappenavn"
+#: ../data/menus.ui.h:88
+msgid "Downloads Directory"
+msgstr "Nedlastinger-mappe"
-#: ../src/browser.c:3893
-#, c-format
-msgid "Could not convert '%s' into filename encoding."
-msgstr "Klarte ikke å konvertere «%s» til noe som kan brukes i filnavn."
+#: ../data/menus.ui.h:89
+msgid "Music Directory"
+msgstr "Musikkmappe"
-#: ../src/browser.c:3895
-msgid "Please use another name"
-msgstr "Bruk et annet navn"
+#: ../data/menus.ui.h:90
+msgid "_Parent Directory"
+msgstr "_Foreldermappe"
-#: ../src/browser.c:3965
-#, c-format
-msgid "The directory name '%s' already exists"
-msgstr "Mappenavnet «%s» finnes allerede"
+#: ../data/menus.ui.h:91
+msgid "_Default Directory"
+msgstr "_Standardmappe"
-#: ../src/browser.c:3966 ../src/easytag.c:2962
-msgid "Rename File Error"
-msgstr "Feil ved navneendring av fil"
+#: ../data/menus.ui.h:92 ../data/toolbar.ui.h:1
+msgid "_First File"
+msgstr "_Første fil"
-#: ../src/browser.c:4004 ../src/browser.c:4033
-msgid "Rename Directory Error"
-msgstr "Feil ved navneendring av mappe"
+#: ../data/menus.ui.h:93
+msgid "Previous File"
+msgstr "Forrige fil"
-#: ../src/browser.c:4071
-msgid "Directory renamed"
-msgstr "Mappe har fått nytt navn"
+#: ../data/menus.ui.h:94 ../data/toolbar.ui.h:5
+msgid "_Next File"
+msgstr "_Neste fil"
-#: ../src/browser.c:4107
-msgid "Browse Directory With"
-msgstr "Utforsk mappe med"
+#: ../data/menus.ui.h:95 ../data/toolbar.ui.h:7
+msgid "_Last File"
+msgstr "_Siste fil"
+
+#: ../data/menus.ui.h:96
+msgid "Home Directory"
+msgstr "Hjemmemappe"
+
+#: ../data/menus.ui.h:97
+msgid "Default Directory"
+msgstr "Standardmappe"
+
+#: ../data/menus.ui.h:98
+msgid "Set Current Path as Default"
+msgstr "Bruk gjeldende filsti som standard"
+
+#: ../data/menus.ui.h:100
+msgid "Browse Subdirectories"
+msgstr "Bla gjennom _undermapper"
+
+#: ../data/menus.ui.h:101
+msgid "Invert Selection"
+msgstr "Inverter utvalg"
+
+#: ../data/menus.ui.h:102
+msgid "CDDB Search Files…"
+msgstr "Søk etter filene på CDDB …"
+
+#: ../data/menus.ui.h:103
+msgid "Find…"
+msgstr "Finn …"
+
+#: ../data/menus.ui.h:104
+msgid "Clear Log"
+msgstr "Tøm logg"
+
+#: ../data/playlist_dialog.ui.h:3
+msgid "Use directory name"
+msgstr "Bruk mappenavn"
+
+#: ../data/playlist_dialog.ui.h:4
+msgid "Options"
+msgstr "Valg"
-#: ../src/browser.c:4123 ../src/browser.c:4249
-msgid "Program to run:"
-msgstr "Program som skal kjøres:"
+#: ../data/playlist_dialog.ui.h:5
+msgid "Include only the selected files"
+msgstr "Bare ta med de valgte filene"
-#: ../src/browser.c:4135
+#: ../data/playlist_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:164
msgid ""
-"Enter the program to run. It will receive the current directory as parameter."
-msgstr ""
-"Skriv navnet på programmet som skal kjøres. Gjeldende mappe blir brukt som "
-"parameter."
+"Whether to use only the selected files or all files when creating playlists"
+msgstr "Om nye spillelister skal inneholde merkede filer eller alle filer"
-#: ../src/browser.c:4229
-msgid "Open Files With"
-msgstr "Åpne filer med"
+#: ../data/playlist_dialog.ui.h:7
+msgid "Use full path for files in playlist"
+msgstr "Bruk fullstendig filsti for filer i spillelista"
+
+#: ../data/playlist_dialog.ui.h:8
+msgid "Use relative path for files in playlist"
+msgstr "Bruk relativ filsti for filer i spillelista"
+
+#: ../data/playlist_dialog.ui.h:9
+msgid "Create playlist in the parent directory"
+msgstr "Lag ny spilleliste i foreldermappe"
+
+#: ../data/playlist_dialog.ui.h:10 ../data/org.gnome.EasyTAG.gschema.xml.h:168
+msgid "Whether to create the playlist in the parent directory"
+msgstr "Om aktuell spilleliste skal lagres i foreldermappe"
+
+#: ../data/playlist_dialog.ui.h:11
+msgid "Use DOS directory separator"
+msgstr "Bruk DOS-vennlig mappeskilletegn"
-#: ../src/browser.c:4261
+#: ../data/playlist_dialog.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:170
msgid ""
-"Enter the program to run. It will receive the current file as parameter."
+"Whether to use backslash as directory separator when generating playlists"
msgstr ""
-"Skriv navnet på programmet som skal kjøres. Gjeldende fil blir brukt som "
-"parameter."
+"Om omvendt skråstrek («\\») skal brukes som mappe-skilletegn ved opprettelse "
+"av spillelister"
-#: ../src/cddb.c:313
-msgid "Artist / Album"
-msgstr "Artist / album"
+#: ../data/playlist_dialog.ui.h:13
+msgid "Content"
+msgstr "Innhold"
-#: ../src/cddb.c:313
-msgid "Category"
-msgstr "Kategori"
+#: ../data/playlist_dialog.ui.h:14
+msgid "Write only list of files"
+msgstr "Bare skriv en liste over filer"
-#. Note: don't set "" instead of NULL else this will cause problem with translation language
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Track Name".
-#: ../src/cddb.c:314 ../src/cddb.c:489
-msgid "Track Name"
-msgstr "Spornavn"
+#: ../data/playlist_dialog.ui.h:15
+msgid "Write information using filename"
+msgstr "Skriv info ved bruk av filnavn"
-#: ../src/cddb.c:314
-msgid "Duration"
-msgstr "Varighet"
+#: ../data/playlist_dialog.ui.h:16
+msgid "Write information using:"
+msgstr "Skriv info ved bruk av:"
-#: ../src/cddb.c:326
-msgid "CDDB Search"
-msgstr "CDDB-søk"
+#: ../data/preferences_dialog.ui.h:1
+msgid "Browser"
+msgstr "Utforsker"
-#.
-#. * 1 - Page for automatic search (generate the CDDBId from files)
-#.
-#: ../src/cddb.c:346
-msgid "Automatic Search"
-msgstr "Automatisk søk"
+#: ../data/preferences_dialog.ui.h:2
+msgid "Default Directory:"
+msgstr "Standardmappe:"
-#: ../src/cddb.c:356
-msgid "Request CDDB"
-msgstr "Spør CDDB"
+#: ../data/preferences_dialog.ui.h:3 ../data/org.gnome.EasyTAG.gschema.xml.h:4
+msgid "The default path to search for music files"
+msgstr "Standard filsti å søke etter musikkfiler på"
-#: ../src/cddb.c:366
+#: ../data/preferences_dialog.ui.h:4
msgid ""
-"Request automatically the CDDB using the selected files (the order is "
-"important) to generate the CddbID"
+"Load on startup the default directory or the directory passed as argument"
msgstr ""
-"Spør CDDB automatisk om de valgte filene (rekkefølgen er viktig) for å lage "
-"CddbID"
+"Last inn standardmappe ved oppstart, eller mappen som brukes som argument"
-#: ../src/cddb.c:377 ../src/cddb.c:457
-msgid "Stop the search"
-msgstr "Avbryt søket"
+#: ../data/preferences_dialog.ui.h:5 ../data/org.gnome.EasyTAG.gschema.xml.h:2
+msgid ""
+"Whether to load the default path (or the path passed as an argument) on "
+"application startup"
+msgstr ""
+"Om standard sti (eller argumentert sti) skal lastes inn når programmet "
+"starter"
-#. Check box to run the scanner
-#: ../src/cddb.c:384
-msgid "Use local CDDB"
-msgstr "Bruk lokal CDDB"
+#: ../data/preferences_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:5
+msgid "Browse subdirectories"
+msgstr "Søk gjennom undermapper"
-#: ../src/cddb.c:387 ../src/cddb.c:850
+#: ../data/preferences_dialog.ui.h:7 ../data/org.gnome.EasyTAG.gschema.xml.h:6
msgid ""
-"When activating this option, after loading the fields, the current selected "
-"scanner will be ran (the scanner window must be opened)."
+"Whether to search subdirectories for audio files when reading a directory in "
+"the browser"
msgstr ""
-"Når du slår på dette valget, kjøres valgt skanner (skannervinduet må være "
-"åpent) etter at feltene er lastet inn."
+"Om undermapper skal gjennomsøkes for lydfiler når en mappe åpnes i "
+"utforskeren."
-#.
-#. * 2 - Page for manual search
-#.
-#: ../src/cddb.c:404
-msgid "Manual Search"
-msgstr "Manuelt søk"
+#: ../data/preferences_dialog.ui.h:8 ../data/org.gnome.EasyTAG.gschema.xml.h:9
+msgid "Expand the subdirectories of the selected directory"
+msgstr "Utvid undermapper av valgt mappe"
-#: ../src/cddb.c:416
-msgid "Words:"
-msgstr "Ord:"
+#: ../data/preferences_dialog.ui.h:9
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:10
+msgid ""
+"Whether to expand the subdirectories of a node in the directory browser when "
+"selecting it"
+msgstr ""
+"Om filutforskeren skal vise evt. undermapper av mapper som brukeren velger"
-#: ../src/cddb.c:429
-msgid "Enter the words to search (separated by a space or '+')"
-msgstr "Skriv inn ordene du vil søke etter (adskilt med mellomrom eller «+»)"
+#: ../data/preferences_dialog.ui.h:10
+msgid "Search hidden directories"
+msgstr "Søk gjennom skjulte mapper"
-#.
-#. * Search options
-#.
-#: ../src/cddb.c:469
-msgid "Search In:"
-msgstr "Søk i:"
-
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "All fields".
-#: ../src/cddb.c:479
-msgid "All Fields"
-msgstr "Alle felt"
-
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Other".
-#: ../src/cddb.c:492 ../src/picture.c:862 ../src/prefs.c:807
-msgid "Other"
-msgstr "Annet"
+#: ../data/preferences_dialog.ui.h:11
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:8
+msgid ""
+"Whether to show hidden directories when showing a directory in the browser"
+msgstr "Om skjulte maper skal vises når en mappe åpnes i utforskeren"
+
+#: ../data/preferences_dialog.ui.h:12
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:53
+msgid "Sort files case-sensitively"
+msgstr "Skill mellom store og små bokstaver ved filsortering"
+
+#: ../data/preferences_dialog.ui.h:13
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:54
+msgid "Whether file sorting is case-sensitive"
+msgstr "Om filsortering skal skille mellom store og småbokstaver"
+
+#: ../data/preferences_dialog.ui.h:15
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:59
+msgid "Show the log"
+msgstr "Vis logg"
+
+#: ../data/preferences_dialog.ui.h:16
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:60
+msgid "Whether to show the log in the main window"
+msgstr "Om loggen skal vises i hovedvinduet"
+
+#: ../data/preferences_dialog.ui.h:17
+msgid "Maximum number of lines:"
+msgstr "Maksimalt antall linjer:"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "All Categories".
-#: ../src/cddb.c:516
-msgid "All Categories"
-msgstr "Alle kategorier"
+#: ../data/preferences_dialog.ui.h:18
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:58
+msgid "The maximum number of lines to keep in the log"
+msgstr "Maksimalt antall linjer som skal beholdes i loggen"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Blues".
-#: ../src/cddb.c:520
-msgid "Blues"
-msgstr "Blues"
+#: ../data/preferences_dialog.ui.h:19
+msgid "General"
+msgstr "Generelt"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Classical".
-#: ../src/cddb.c:523
-msgid "Classical"
-msgstr "Klassisk"
+#: ../data/preferences_dialog.ui.h:20
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:49
+msgid "Show audio file header summary"
+msgstr "Vis oppsummering av filhoder i lydfiler"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Country".
-#: ../src/cddb.c:526
-msgid "Country"
-msgstr "Land"
+#: ../data/preferences_dialog.ui.h:21
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:50
+msgid ""
+"Whether to show header information, such as bit rate and duration, for audio "
+"files"
+msgstr ""
+"Om informasjon om filhoder - som f.eks. bitfrekvens og varighet - skal vises "
+"for lydfiler"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Folk".
-#: ../src/cddb.c:529
-msgid "Folk"
-msgstr "Folk"
+#: ../data/preferences_dialog.ui.h:22
+msgid "Display changed files in list using:"
+msgstr "Vis endrede filer i lista med:"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Jazz".
-#: ../src/cddb.c:532
-msgid "Jazz"
-msgstr "Jazz"
+#: ../data/preferences_dialog.ui.h:23
+msgid "Red color"
+msgstr "Rød farge"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Misc".
-#: ../src/cddb.c:535
-msgid "Misc."
-msgstr "Div."
+#: ../data/preferences_dialog.ui.h:24
+msgid "Bold style"
+msgstr "Fet stil"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "New age".
-#: ../src/cddb.c:538
-msgid "New Age"
-msgstr "New Age"
+#: ../data/preferences_dialog.ui.h:25
+msgid "Interface"
+msgstr "Grensesnitt"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Reggae".
-#: ../src/cddb.c:541
-msgid "Reggae"
-msgstr "Reggae"
+#: ../data/preferences_dialog.ui.h:26
+msgid "File Settings"
+msgstr "Filinnstillinger"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Rock".
-#: ../src/cddb.c:544
-msgid "Rock"
-msgstr "Rock"
+#: ../data/preferences_dialog.ui.h:27
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:45
+msgid "Preserve modification time when writing files"
+msgstr "Behold endringstidspunkt ved lagring av filer"
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Soundtrack".
-#: ../src/cddb.c:547
-msgid "Soundtrack"
-msgstr "Soundtrack"
+#: ../data/preferences_dialog.ui.h:28
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:46
+msgid "Whether to preserve the existing modification time when editing files"
+msgstr "Om gjeldende endringstid skal beholdes ved redigering av filer"
-#: ../src/cddb.c:587
-msgid "included: funk, soul, rap, pop, industrial, metal, etc."
-msgstr "inkludert: funk, soul, rap, pop, industrial, metal, etc."
+#: ../data/preferences_dialog.ui.h:29
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:47
+msgid "Update parent directory modification time when writing files"
+msgstr "Oppdater endringstidspunkt på foreldermappe ved lagring av filer"
-#: ../src/cddb.c:588
-msgid "movies, shows"
-msgstr "filmer, serier"
+#: ../data/preferences_dialog.ui.h:30
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:48
+msgid ""
+"Whether to update the modification time on the parent directory when editing "
+"files"
+msgstr ""
+"Om foreldermapper skal få nytt endringstidspunkt ved redigering av "
+"underliggende filer"
-#: ../src/cddb.c:589
-msgid "others that do not fit in the above categories"
-msgstr "annet som ikke passer inn i overnevnte kategorier"
+#: ../data/preferences_dialog.ui.h:31
+msgid "Filenames"
+msgstr "Filnavn"
-#. Button to display/hide the categories
-#: ../src/cddb.c:592
-msgid "Categories"
-msgstr "Kategorier"
+#: ../data/preferences_dialog.ui.h:32
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:195
+msgid "Replace illegal characters when renaming"
+msgstr "Erstatt ugyldige tegn når filer får nye navn"
-#.
-#. * Results command
-#.
-#: ../src/cddb.c:600
-msgid "Results:"
-msgstr "Resultater:"
+#: ../data/preferences_dialog.ui.h:33
+msgid ""
+"Convert characters which cannot be represented in filenames on the FAT32/16 "
+"and Joliet filesystems (‘\\’, ‘:’, ‘;’, ‘*’, ‘?’, ‘\"’, ‘<’, ‘>’, ‘|’)"
+msgstr ""
+"Konverter tegn som ikke kan brukes i filnavn på filsystemer av typen "
+"FAT32-/16- og Joilet («\\», «:», «;», «*», «?», «\"», «<», «>», «|»)"
-#: ../src/cddb.c:606 ../src/misc.c:1951
-msgid "Search:"
-msgstr "Søk:"
+#: ../data/preferences_dialog.ui.h:34
+msgid "Convert filename extension to:"
+msgstr "Endre filetternavn til:"
+
+#: ../data/preferences_dialog.ui.h:35
+msgid "Lower Case"
+msgstr "Små bokstaver"
-#: ../src/cddb.c:620
-msgid "Enter the words to search in the list below"
-msgstr "Skriv inn ordene du vil søke etter i lista nedenfor"
+#: ../data/preferences_dialog.ui.h:36
+msgid "For example, the extension will be converted to ‘.mp3’"
+msgstr "Filetternavnet blir for eksempel endret til «.mp3»"
-#: ../src/cddb.c:632
-msgid "Search Next"
-msgstr "Søk etter neste"
+#: ../data/preferences_dialog.ui.h:37
+msgid "Upper Case"
+msgstr "Store bokstaver"
-#: ../src/cddb.c:638
-msgid "Search Previous"
-msgstr "Søk etter forrige"
+#: ../data/preferences_dialog.ui.h:38
+msgid "For example, the extension will be converted to ‘.MP3’"
+msgstr "Filetternavnet blir for eksempel endret til «.MP3»"
-#: ../src/cddb.c:649
-msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
-msgstr "Bare vis røde linjer (eller alle linjer) i «Artist / album»-lista"
+#: ../data/preferences_dialog.ui.h:39
+msgid "No Change"
+msgstr "Ingen endring"
-#: ../src/cddb.c:655
-msgid "Unselect all lines"
-msgstr "Velg bort alle linjer"
+#: ../data/preferences_dialog.ui.h:40
+msgid "The extension will not be modified"
+msgstr "Utvidelsen blir ikke endret"
-#: ../src/cddb.c:661
-msgid "Invert lines selection"
-msgstr "Inverter linjeutvalg"
+#: ../data/preferences_dialog.ui.h:41
+msgid "Filename Encoding"
+msgstr "Koding av filnavn"
-#: ../src/cddb.c:670
-msgid "Select all lines"
-msgstr "Velg alle linjer"
+#: ../data/preferences_dialog.ui.h:42
+msgid "Try another character encoding"
+msgstr "Prøv en annen tegnkoding"
-#: ../src/cddb.c:788
+#: ../data/preferences_dialog.ui.h:43
msgid ""
-"Select lines to 'apply' to your files list. All lines will be processed if "
-"no line is selected.\n"
-"You can also reorder lines in this list before using 'apply' button."
+"Try to use the encoding associated with your locale and if this fails, try "
+"the ISO-8859-1 character encoding"
msgstr ""
-"Velg linjer som skal «brukes» på fillista. Alle linjer blir behandlet hvis "
-"du ikke velger noen linjer.\n"
-"Du kan også omorganisere linjer i denne lista før du trykker på «bruk»-"
-"knappen."
+"Prøv å bruke tegnkodesettet som er tildelt gjeldende region. Prøv ISO-8859-1 "
+"hvis dette mislykkes"
-#.
-#. * Apply results to fields...
-#.
-#: ../src/cddb.c:795
-msgid "Set Into:"
-msgstr "Velg dette for:"
+#: ../data/preferences_dialog.ui.h:44
+msgid "Transliterate characters into the system character encoding"
+msgstr "Oversett tegn til systemets tegnkoding"
-#: ../src/cddb.c:801
-msgid "All"
-msgstr "Alle"
+#: ../data/preferences_dialog.ui.h:45
+msgid ""
+"Replace unsupported characters with a similar character from the target "
+"character encoding"
+msgstr "Erstatt ustøttede tegn med liknende tegn fra ønsket tegnkodesett"
-#: ../src/cddb.c:808
-msgid "Track #"
-msgstr "Spor #"
+#: ../data/preferences_dialog.ui.h:46
+msgid ""
+"Use the system character encoding and silently discard unsupported characters"
+msgstr "Bruk systemets tegnkoding, og forkast ustøttede tegn uten å gi beskjed"
-#: ../src/cddb.c:809
-msgid "# Tracks"
-msgstr "# spor"
+#: ../data/preferences_dialog.ui.h:47
+msgid ""
+"Discard characters which cannot be represented in the target character "
+"encoding"
+msgstr "Forkast tegn som ikke kan vises med ønsket tegnkoding"
-#. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:2992
-msgid "Run the current scanner for each file"
-msgstr "Kjør gjeldende skanner på hver fil"
+#: ../data/preferences_dialog.ui.h:48
+msgid "Files"
+msgstr "Filer"
-#. Check box to use DLM (also used in the preferences window)
-#: ../src/cddb.c:854
-msgid "Match lines with the Levenshtein algorithm"
-msgstr "Finn linjer som passer sammen med Levenshtein-algoritmen"
+#: ../data/preferences_dialog.ui.h:49
+msgid "Automatically complete date field"
+msgstr "Fullfør datofelt automatisk"
-#. Doesn't activate it by default because if the new user don't pay attention to it,
-#. it will not understand why the cddb results aren't loaded correctly...
-#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: ../src/cddb.c:859 ../src/prefs.c:1363
-msgid ""
-"When activating this option, the Levenshtein algorithm (DLM: Damerau-"
-"Levenshtein Metric) will be used to match the CDDB title against every "
-"filename in the current folder, and to select the best match. This will be "
-"used when selecting the corresponding audio file, or applying CDDB results, "
-"instead of using directly the position order."
-msgstr ""
-"Når du slår på dette valget, brukes Levenshtein-algoritmen (DLM: Damerau-"
-"Levenshtein Metric) til å koble CDDB-tittelen med hvert filnavn i gjeldende "
-"mappe, og til å velge hvilket treff som passer best. Dette brukes når du "
-"velger hvilken lydfil det gjelder eller når du tar i bruk CDDB-resultater, i "
-"stedet for å bruke posisjonsrekkefølgen direkte."
-
-#: ../src/cddb.c:871
-msgid "Load the selected lines or all lines (if no line selected)."
-msgstr "Last inn valgte linjer, evt. alle linjer hvis ingen er valgt."
+#: ../data/preferences_dialog.ui.h:50
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:94
+msgid "Whether to automatically complete the date tag"
+msgstr "Om dato-taggen skal fullføres automatisk"
-#: ../src/cddb.c:881
-msgid "Ready to search"
-msgstr "Klar til å søke"
+#: ../data/preferences_dialog.ui.h:51
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:99
+msgid "Automatically select the type of the image based on its filename"
+msgstr "Velg bildetype automatisk, basert på filnavn"
-#: ../src/cddb.c:1352
-#, c-format
+#: ../data/preferences_dialog.ui.h:52
msgid ""
-"Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
+"Whether to, when adding cover art, automatically select a type for an image "
+"based on its filename"
msgstr ""
-"Album: «%s», artist: «%s», varighet: «%s», år: «%s», sjanger: «%s», ID: «%s»"
+"Om bildetype skal velges automatisk for coverbilder som legges til, basert "
+"på bildenes filnavn"
-#: ../src/cddb.c:1588
-#, c-format
-msgid "Resolving host '%s'…"
-msgstr "Slår opp vertsnavnet «%s» …"
+#: ../data/preferences_dialog.ui.h:53
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:105
+msgid "Preserve the tag field focus"
+msgstr "Behold fokus på taggfelt"
-#: ../src/cddb.c:1629
-#, c-format
-msgid "Cannot create a new socket (%s)"
-msgstr "Klarte ikke å lage en ny nokkel (%s)"
+#: ../data/preferences_dialog.ui.h:54
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:106
+msgid "Whether to preserve focus on the current tag field when switching file"
+msgstr ""
+"Om taggfeltet du fokuserer på fremdeles skal være i fokus når du velger en "
+"annen fil"
-#: ../src/cddb.c:1643
-msgid "Cannot set options on the newly-created socket"
-msgstr "Klarte ikke å foreta valg på sokkelen som nettopp ble satt opp"
+#: ../data/preferences_dialog.ui.h:55
+msgid "Pad the number of digits in the disc field to:"
+msgstr "Utfyll antall sifre i platenummer-feltet til:"
-#. Open connection to the server.
-#: ../src/cddb.c:1647
-#, c-format
-msgid "Connecting to host '%s', port '%d'…"
-msgstr "Kobler til verten «%s», port %d …"
+#: ../data/preferences_dialog.ui.h:56
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:96
+msgid "Whether the disc number tag field should be padded with leading zeroes"
+msgstr "Om taggfeltet for platenummer skal fylles ut med ledende nuller"
-#: ../src/cddb.c:1660
-#, c-format
-msgid "Cannot connect to host '%s' (%s)"
-msgstr "Klarte ikke å koble til verten «%s» (%s)"
+#: ../data/preferences_dialog.ui.h:57
+msgid "Pad the number of digits in the track field to:"
+msgstr "Utfyll antall sifre i spornummer-feltet til:"
-#: ../src/cddb.c:1684
-#, c-format
-msgid "Cannot resolve host '%s' (%s)"
-msgstr "Klarte ikke å gjøre oppslag på vertsnavnet «%s» (%s)"
+#: ../data/preferences_dialog.ui.h:58
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:102
+msgid "Whether the track number tag field should be padded with leading zeroes"
+msgstr "Om taggfeltet for spornummer skal fylles ut med ledende nuller"
-#: ../src/cddb.c:1697
-#, c-format
-msgid "Connected to host '%s'"
-msgstr "Koblet til vert «%s»"
+#: ../data/preferences_dialog.ui.h:59
+msgid "Splitting"
+msgstr "Oppdeling"
-#: ../src/cddb.c:1778
-#, c-format
-msgid "Error while writing CDDB results to file '%s'"
-msgstr "Det oppstod en feil ved skriving av resultater fra CDDB til fila «%s»"
+#: ../data/preferences_dialog.ui.h:60
+msgid ""
+"For Vorbis tags, selected fields will be split at dashes and saved as "
+"separate tags"
+msgstr ""
+"I Vorbis-tagger deles valgte felter opp ved streker, og lagres som separate "
+"tagger"
-#: ../src/cddb.c:1789
-#, c-format
-msgid "Receiving data (%s)…"
-msgstr "Mottar data (%s) …"
+#: ../data/preferences_dialog.ui.h:62
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:206
+msgid "Whether to split title fields at a “ - ” separator in Ogg comments"
+msgstr "Om tittelfelt skal holdes adskilt med «-» i Ogg-kommentarområdet"
+
+#: ../data/preferences_dialog.ui.h:64
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:208
+msgid "Whether to split artist fields at a “ - ” separator in Ogg comments"
+msgstr "Om artistfelt skal holdes adskilt med «-» i Ogg-kommentarområdet"
+
+#: ../data/preferences_dialog.ui.h:66
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:210
+msgid "Whether to split album fields at a “ - ” separator in Ogg comments"
+msgstr "Om albumfelt skal holdes adskilt med «-» i Ogg-kommentarområdet"
+
+#: ../data/preferences_dialog.ui.h:68
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:212
+msgid "Whether to split genre fields at a “ - ” separator in Ogg comments"
+msgstr "Om sjangerfelt skal holdes adskilt med «-» i Ogg-kommentarområdet"
+
+#: ../data/preferences_dialog.ui.h:70
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:214
+msgid "Whether to split comment fields at a “ - ” separator in Ogg comments"
+msgstr "Om kommentarfelt skal holdes adskilt med «-» i Ogg-kommentarområdet"
+
+#: ../data/preferences_dialog.ui.h:72
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:216
+msgid "Whether to split composer fields at a “ - ” separator in Ogg comments"
+msgstr "Om komponistfelt skal holdes adskilt med «-» i Ogg-kommentarområdet"
+
+#: ../data/preferences_dialog.ui.h:73
+msgid "Original artist"
+msgstr "Opprinnelig artist"
-#: ../src/cddb.c:1801
-#, c-format
-msgid "Error when reading CDDB response (%s)"
-msgstr "Det oppstod en feil ved lesing av svar fra CDDB (%s)"
+#: ../data/preferences_dialog.ui.h:74
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:218
+msgid ""
+"Whether to split original artist fields at a “ - ” separator in Ogg comments"
+msgstr ""
+"Om felt for opprinnelig artist skal holdes adskilt med «-» i Ogg-"
+"kommentarområdet"
-#: ../src/cddb.c:1808
-#, c-format
-msgid "Cannot create file '%s' (%s)"
-msgstr "Klarte ikke å lage fila «%s» (%s)"
+#: ../data/preferences_dialog.ui.h:75
+msgid "Tags"
+msgstr "Tagger"
-#: ../src/cddb.c:1849 ../src/setting.c:1256
-#, c-format
-msgid "Cannot open file '%s' (%s)"
-msgstr "Klarte ikke å åpne fila «%s» (%s)"
+#: ../data/preferences_dialog.ui.h:76
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:63
+msgid "Strip ID3 tags if all ID3 tags are empty"
+msgstr "Tøm ID3-tagger hvis alle felter er tomme"
-#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
-#. Send the request
-#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
-#. Send the request
-#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
-#. Send the request
-#: ../src/cddb.c:2362 ../src/cddb.c:2693 ../src/cddb.c:3568
-msgid "Sending request…"
-msgstr "Sender forespørsel …"
+#: ../data/preferences_dialog.ui.h:77
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:64
+msgid ""
+"Whether to remove the ID3 tag from the audio file if all the individual tag "
+"fields are empty"
+msgstr "Om ID3-tagg skal fjernes fra lydfiler hvis alle taggfeltene er tomme"
-#: ../src/cddb.c:2366 ../src/cddb.c:2697 ../src/cddb.c:3267 ../src/cddb.c:3572
-#, c-format
-msgid "Cannot send the request (%s)"
-msgstr "Klarte ikke å sende forespørselen (%s)"
+#: ../data/preferences_dialog.ui.h:78
+msgid "Non-standard encoding for reading ID3 tags:"
+msgstr "Ikke-standard tegnkoding for å lese ID3-tagger:"
-#.
-#. * Read the answer
-#.
-#. Read the answer
-#: ../src/cddb.c:2393 ../src/cddb.c:3281 ../src/cddb.c:3581
-msgid "Receiving data…"
-msgstr "Mottar data …"
+#: ../data/preferences_dialog.ui.h:79
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:62
+msgid "Whether to use a non-standard character encoding when reading ID3 tags"
+msgstr "Om et ikke-standard-tegnsett skal brukes til lesing av ID3-tagger"
-#: ../src/cddb.c:2400 ../src/cddb.c:2726 ../src/cddb.c:3288 ../src/cddb.c:3588
-msgid "The server returned a bad response"
-msgstr "Tjeneren sendte en negativ responskode"
+#: ../data/preferences_dialog.ui.h:80
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:72
+msgid "Choose the character set to be used when reading ID3v1 and ID3v2 tags"
+msgstr "Velg tegnsettet som skal brukes til lesing av ID3v1- og ID3v2-tagger"
-#: ../src/cddb.c:2414 ../src/cddb.c:2742 ../src/cddb.c:3303 ../src/cddb.c:3605
-#: ../src/cddb.c:3620
-#, c-format
-msgid "The server returned a bad response: %s"
-msgstr "Tjeneren sendte en negativ responskode: %s"
+#: ../data/preferences_dialog.ui.h:81
+msgid "ID3v2"
+msgstr "ID3v2"
-#: ../src/cddb.c:2561
-#, c-format
-msgid "Sorry, the web-based search is currently not available"
-msgstr "Nettbasert søk er ikke tilgjengelig for øyeblikket"
+#: ../data/preferences_dialog.ui.h:82
+msgid "Write ID3v2 tag"
+msgstr "Skriv ID3v2-tagg"
-#: ../src/cddb.c:2563 ../src/cddb.c:2913
-#, c-format
-msgid "Found one matching album"
-msgid_plural "Found %d matching albums"
-msgstr[0] "Fant ett album som samsvarer"
-msgstr[1] "Fant %d album som samsvarer"
+#: ../data/preferences_dialog.ui.h:83
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:74
+msgid "Whether to write ID3v2 tags when writing ID3 tags into audio files"
+msgstr "Om ID3v2 skal brukes til lagring av ID3-tagger"
-#: ../src/cddb.c:2714
-#, c-format
-msgid "Receiving data of page %d (album %d/%d)…"
-msgstr "Mottar data om side %d (album %d/%d) …"
+#: ../data/preferences_dialog.ui.h:84
+msgid "Version:"
+msgstr "Versjon:"
-#: ../src/cddb.c:2716
-#, c-format
-msgid "Receiving data of page %d…"
-msgstr "Mottar data om side %d …"
+#: ../data/preferences_dialog.ui.h:85
+msgid ""
+"Select the ID3v2 tag version to write:\n"
+" • ID3v2.3 is written using id3lib,\n"
+" • ID3v2.4 is written using libid3tag (recommended)"
+msgstr ""
+"Velg ID3v2-taggversjonen som skal brukes:\n"
+" - ID3v2.3 skrives med id3lib, og\n"
+" - ID3v2.4 skrives med libid3tag (anbefales)."
-#: ../src/cddb.c:2880
-#, c-format
-msgid "More results to load…"
-msgstr "Flere resultater å laste inn …"
+#: ../data/preferences_dialog.ui.h:88
+msgid "Character encoding:"
+msgstr "Tegnkoding:"
-#: ../src/cddb.c:3009
-#, c-format
-msgid "No file selected"
-msgstr "Ingen fil er valgt"
+#: ../data/preferences_dialog.ui.h:89
+msgid "Unicode"
+msgstr "Unicode "
-#. The CD redbook standard defines the maximum number of tracks as 99, any
-#. queries with more than 99 tracks will never return a result.
-#: ../src/cddb.c:3017
-#, c-format
-msgid "More than 99 files selected. Cannot send request"
-msgstr "Du har valgt flere enn 99 filer. Forespørselen kan ikke sendes"
+#: ../data/preferences_dialog.ui.h:90
+msgid ""
+"Choose the Unicode character encoding to be used when writing ID3v2 tags"
+msgstr "Velg Unicode-tegnsettet som skal brukes til ID3v2-tagger"
-#: ../src/cddb.c:3023
-#, c-format
-msgid "One file selected"
-msgid_plural "%d files selected"
-msgstr[0] "Én fil valgt"
-msgstr[1] "%d filer valgt"
+#: ../data/preferences_dialog.ui.h:92
+msgid ""
+"Override the standard Unicode character encoding to be used when writing "
+"ID3v2 tags"
+msgstr ""
+"Overstyr standard Unicode-tegnsett som skal brukes til lagring av ID3v2-"
+"tagger"
-#: ../src/cddb.c:3107
-msgid "The path for 'Local CD Database' was not defined"
-msgstr "Stien til «Lokal CD-database» var ikke angitt"
+#: ../data/preferences_dialog.ui.h:93
+msgid "When encoding conversion fails:"
+msgstr "Når tegnsett-konvertering mislykkes:"
-#. Translators: 'it' in this sentence refers to the local CD
-#. * database path.
-#: ../src/cddb.c:3110
-msgid "Enter it in the preferences window before using this search."
-msgstr "Skriv det inn i oppsettsvinduet før du bruker denne søkefunksjonen."
+#: ../data/preferences_dialog.ui.h:94
+msgid "Report error"
+msgstr "Rapporter programfeil"
-#: ../src/cddb.c:3112
-msgid "Local CD search"
-msgstr "Lokalt CD-søk"
+#: ../data/preferences_dialog.ui.h:95
+msgid ""
+"Display an error message when a character cannot be represented in the "
+"target character encoding and keep the original character"
+msgstr ""
+"Vis en feilmelding når et tegn ikke kan brukes med ønsket tegnsett, og "
+"behold opprinnelig tegn"
-#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb.c:3257
-#, c-format
-msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
-msgstr "Sender forespørsel (CddbId: %s, #spor: %d, platelengde: %d) …"
+#: ../data/preferences_dialog.ui.h:96
+msgid "Transliterate"
+msgstr "Oversett"
-#: ../src/cddb.c:3414
-#, c-format
-msgid "DiscID '%s' gave one matching album"
-msgid_plural "DiscID '%s' gave %d matching albums"
-msgstr[0] "Plate-ID «%s» samsvarte med ett album"
-msgstr[1] "Plate-ID «%s» samsvarte med %d album"
+#: ../data/preferences_dialog.ui.h:97
+msgid "Discard"
+msgstr "Forkast"
-#: ../src/cddb.c:3512
-#, c-format
-msgid "Can't load file: '%s' (%s)."
-msgstr "Klarte ikke å laste inn fila «%s» (%s)."
+#: ../data/preferences_dialog.ui.h:98
+msgid "Automatically convert old ID3v2 tag versions"
+msgstr "Konverter gamle ID3v2-tagger automatisk"
-#. Load the track list of the album
-#: ../src/cddb.c:3811
-msgid "Loading album track list…"
-msgstr "Laster inn albumets sporliste …"
+#: ../data/preferences_dialog.ui.h:99
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:78
+msgid ""
+"Whether to convert ID3 tags written against old version of the "
+"specification, such as ID3v2.2, to newer ones, such as ID3v2.3 or ID3v2.4"
+msgstr ""
+"Om gamle ID3-tagger av gamle ID3-versjoner (som f.eks. ID3v2.2) skal "
+"konverteres til nye versjoner (f.eks. ID3v2.3 eller ID3v2.4)"
+
+#: ../data/preferences_dialog.ui.h:100
+msgid "Use CRC-32"
+msgstr "Bruk CRC-32"
+
+#: ../data/preferences_dialog.ui.h:101
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:82
+msgid "Whether to embed a CRC-32 checksum of the audio file data in ID3v2 tags"
+msgstr "Om en CRC-32-kontrollsum skal innebygges i lydfiler i ID3v2-tagger"
+
+#: ../data/preferences_dialog.ui.h:102
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:79
+msgid "Compress data in ID3v2 tags"
+msgstr "Komprimer data i ID3v2-tagger"
+
+#: ../data/preferences_dialog.ui.h:103
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:80
+msgid "Whether to compress data in ID3v2 tags"
+msgstr "Om data i ID3v2-tagger skal komprimeres"
+
+#: ../data/preferences_dialog.ui.h:104
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:83
+msgid "Use text-only genre in ID3v2 tags"
+msgstr "Bruk ren tekst for sjanger i ID3v2-tagger"
+
+#: ../data/preferences_dialog.ui.h:105
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:84
+msgid ""
+"Whether to use only a string, and not the integer-base ID3v1 genre field, "
+"when writing a genre field to ID3v2 tags"
+msgstr ""
+"Om en ren tekststreng skal brukes til lagring av sjangerfelt i ID3v2-tagger, "
+"i stedet for heltall-basert ID3v1-sjanger-ID"
+
+#: ../data/preferences_dialog.ui.h:106
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../data/preferences_dialog.ui.h:107
+msgid "Write ID3v1 tag"
+msgstr "Skriv ID3v1-tagg"
+
+#: ../data/preferences_dialog.ui.h:108
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:66
+msgid "Whether to write ID3v1 tags when writing ID3 tags into audio files"
+msgstr "Om ID3v1-tagger skal brukes til lagring av ID3-tagger i lydfiler"
+
+#: ../data/preferences_dialog.ui.h:109
+msgid "Choose the character set to be used when writing ID3v1 tag"
+msgstr "Velg hvilket tegnsett som skal brukes ved skriving av ID3v1-tagger"
+
+#: ../data/preferences_dialog.ui.h:110
+msgid "ID3 Tags"
+msgstr "ID3-tagger"
+
+#: ../data/preferences_dialog.ui.h:111
+msgid "Character Conversion"
+msgstr "Tegnkonvertering"
+
+#: ../data/preferences_dialog.ui.h:112
+msgid "Fill Tag Scanner"
+msgstr "Skann og fyll ut tagg"
+
+#: ../data/preferences_dialog.ui.h:114
+#, no-c-format
+msgid "Convert underscores and ‘%20’ to spaces"
+msgstr "Bytt ut understrek og «%20» med mellomrom"
+
+#: ../data/preferences_dialog.ui.h:116
+#, no-c-format
+msgid "Convert spaces and ‘%20’ to underscores"
+msgstr "Bytt ut mellomrom og «%20» med understrek"
+
+#: ../data/preferences_dialog.ui.h:117
+msgid "No conversion"
+msgstr "Ingen konvertering"
+
+#: ../data/preferences_dialog.ui.h:118
+msgid "Rename File and Directory Scanner"
+msgstr "Skann og gi filer og mapper nytt navn"
+
+#: ../data/preferences_dialog.ui.h:119
+msgid "Process Fields Scanner"
+msgstr "Skann og behandle felt"
+
+#: ../data/preferences_dialog.ui.h:120
+msgid "Upper-case the first letters of all words"
+msgstr "Gjør første bokstav i hvert ord til stor bokstav"
-#: ../src/cddb.c:4010
-msgid "The number of CDDB results does not match the number of selected files"
-msgstr "Antallet i CDDB-resultatene samsvarer ikke med antall valgte filer"
+#: ../data/preferences_dialog.ui.h:121
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:150
+msgid ""
+"Whether to upper-case the first letter of all words, including prepositions "
+"and other short words such as “feat.”, when processing tag fields"
+msgstr ""
+"Om første bokstav i alle ord, inkl. preposisjoner og andre korte ord som "
+"«feat. », skal gjøre om til stor bokstav ved behandling av taggfelt"
-#: ../src/cddb.c:4014
-msgid "Write Tag from CDDB"
-msgstr "Skriv tagg fra CDDB"
+#: ../data/preferences_dialog.ui.h:122
+msgid "Fields"
+msgstr "Felt"
-#: ../src/charset.c:47
-msgid "Arabic (IBM-864)"
-msgstr "Arabisk (IBM-864)"
+#: ../data/preferences_dialog.ui.h:123
+msgid "Overwrite fields when scanning tags"
+msgstr "Overskriv felter når tagger gjennomsøkes"
-#: ../src/charset.c:48
-msgid "Arabic (ISO-8859-6)"
-msgstr "Arabisk (ISO-8859-6)"
+#: ../data/preferences_dialog.ui.h:124
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:111
+msgid ""
+"Whether to overwrite the tag field values when filling tags. Otherwise, only "
+"blank tag fields will be filled"
+msgstr ""
+"Om taggfelt-verdier skal overskrives når tagger fylles ut. Hvis ikke dette "
+"er valgt, blir bare tomme taggfelt endret"
-#: ../src/charset.c:49
-msgid "Arabic (Windows-1256)"
-msgstr "Arabisk (Windows-1256)"
+#: ../data/preferences_dialog.ui.h:125
+msgid "Set this text as default comment:"
+msgstr "Bruk denne teksten som standardkommentar:"
-#: ../src/charset.c:50
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltisk (ISO-8859-13)"
+#: ../data/preferences_dialog.ui.h:126
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:113
+msgid ""
+"Whether to set the comment tag field to the provided default value when "
+"filling tags"
+msgstr "Om kommentar-taggfeltet skal få standardverdi når tagger fylles ut"
-#: ../src/charset.c:51
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltisk (ISO-8859-4)"
+#: ../data/preferences_dialog.ui.h:127
+msgid "Use CRC-32 as the default comment (for files with ID3 tags only)"
+msgstr "Bruk CRC-32 som standardkommentar (bare på filer med ID3-tagger)."
-#: ../src/charset.c:52
-msgid "Baltic (Windows-1257)"
-msgstr "Baltisk (Windows-1257)"
+#: ../data/preferences_dialog.ui.h:128
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:117
+msgid ""
+"Whether to use the CRC-32 of the audio file data as the default comment, for "
+"files with ID3 tags only"
+msgstr ""
+"Om CRC-32-kontrollsum av data i lydfiler skal brukes som standardkommentar. "
+"Dette fungerer bare med ID3-tagger"
-#: ../src/charset.c:53
-msgid "Celtic (ISO-8859-14)"
-msgstr "Keltisk (ISO-8859-14)"
+#: ../data/preferences_dialog.ui.h:129
+msgid "Scanner"
+msgstr "Skanner"
-#: ../src/charset.c:54
-msgid "Central European (IBM-852)"
-msgstr "Sentraleuropeisk (IBM-852)"
+#: ../data/preferences_dialog.ui.h:130
+msgid "Automatic Search Servers"
+msgstr "Automatisk tjenersøk"
-#: ../src/charset.c:55
-msgid "Central European (ISO-8859-2)"
-msgstr "Sentraleuropeisk (ISO-8859-2)"
+#: ../data/preferences_dialog.ui.h:131
+msgid "Host:"
+msgstr "Vertsnavn:"
-#: ../src/charset.c:56
-msgid "Central European (Windows-1250)"
-msgstr "Sentraleuropeisk (Windows-1250)"
+#: ../data/preferences_dialog.ui.h:132
+msgid "Port:"
+msgstr "Port:"
-#: ../src/charset.c:57
-msgid "Chinese Simplified (GB18030)"
-msgstr "Kinesisk, forenklet (GB18030)"
+#: ../data/preferences_dialog.ui.h:133
+msgid "CGI Path:"
+msgstr "CGI-sti:"
-#: ../src/charset.c:58
-msgid "Chinese Simplified (GB2312)"
-msgstr "Kinesisk, forenklet (GB2312)"
+#: ../data/preferences_dialog.ui.h:134
+msgid "Manual Search Server"
+msgstr "Tjener for manuelt søk"
-#: ../src/charset.c:59
-msgid "Chinese Traditional (Big5)"
-msgstr "Kinesisk, tradisjonell (Big5)"
+#: ../data/preferences_dialog.ui.h:135
+msgid "Proxy"
+msgstr "Mellomtjener"
-#: ../src/charset.c:60
-msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Kinesisk, tradisjonell (Big5-HKSCS)"
+#: ../data/preferences_dialog.ui.h:136
+msgid "Use a proxy server"
+msgstr "Bruk mellomtjener"
-#: ../src/charset.c:61
-msgid "Cyrillic (IBM-855)"
-msgstr "Kyrillisk (IBM-855)"
+#: ../data/preferences_dialog.ui.h:137
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:28
+msgid "Whether to access remote CDDB through a proxy"
+msgstr "Om ekstern CDDB skal kontaktes via en mellomtjener"
-#: ../src/charset.c:62
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Kyrillisk (ISO-8859-5)"
+#: ../data/preferences_dialog.ui.h:138
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:30
+msgid "Hostname for a proxy to access remote CDDB"
+msgstr "Vertsnavn på en mellomtjener som skal kontakte CDDB"
-#: ../src/charset.c:63
-msgid "Cyrillic (ISO-IR-111)"
-msgstr "Kyrillisk (ISO-IR-111)"
+#: ../data/preferences_dialog.ui.h:139
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:32
+msgid "Port for a proxy to access remote CDDB"
+msgstr "Port på en mellomtjener som skal kontakte CDDB"
-#: ../src/charset.c:64
-msgid "Cyrillic (KOI8-R)"
-msgstr "Kyrillisk (KOI8-R)"
+#: ../data/preferences_dialog.ui.h:140
+msgid "User:"
+msgstr "Brukernavn:"
-#: ../src/charset.c:65
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kyrillisk (Windows-1251)"
+#: ../data/preferences_dialog.ui.h:141
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:34
+msgid "Username for a proxy to access remote CDDB"
+msgstr "Brukernavn på en mellomtjener som skal kontakte CDDB"
-#: ../src/charset.c:66
-msgid "Cyrillic/Russian (CP-866)"
-msgstr "Kyrillisk/russisk (CP-866)"
+#: ../data/preferences_dialog.ui.h:142
+msgid "Password:"
+msgstr "Passord:"
-#: ../src/charset.c:67
-msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "Kyrillisk/ukrainsk (KOI8-U)"
+#: ../data/preferences_dialog.ui.h:143
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:36
+msgid "Password for a proxy to access remote CDDB"
+msgstr "Passord på en mellomtjener som skal kontakte CDDB"
-#: ../src/charset.c:68
-msgid "English (US-ASCII)"
-msgstr "Engelsk (US-ASCII)"
+#: ../data/preferences_dialog.ui.h:144
+msgid "Results List"
+msgstr "Liste over søkeresultater"
-#: ../src/charset.c:69
-msgid "Greek (ISO-8859-7)"
-msgstr "Gresk (ISO-8859-7)"
+#: ../data/preferences_dialog.ui.h:145
+msgid ""
+"Select corresponding file (according to position or DLM if activated below)"
+msgstr ""
+"Velg tilhørende fil (samsvarende posisjon, eller DLM hvis det er slått på "
+"nedenfor)"
-#: ../src/charset.c:70
-msgid "Greek (Windows-1253)"
-msgstr "Gresk (Windows-1253)"
+#: ../data/preferences_dialog.ui.h:146
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:26
+msgid ""
+"Whether to select the file in the file list which matches the position in "
+"the CDDB results list"
+msgstr ""
+"Om filen i fillista som samsvarer med posisjonen i CDDB-søkeresulatene skal "
+"velges"
-#: ../src/charset.c:71
-msgid "Hebrew (IBM-862)"
-msgstr "Hebraisk (IBM-862)"
+#: ../data/preferences_dialog.ui.h:147
+msgid ""
+"Use the Levenshtein algorithm (DLM) to match results (using title) with "
+"audio files (using filename)"
+msgstr ""
+"Bruk Levenshtein-algoritmen (DLM) til å koble linjer (ved å bruke tittel) "
+"med lydfiler (ved å bruke filnavnet)"
-#: ../src/charset.c:72
-msgid "Hebrew (Windows-1255)"
-msgstr "Hebraisk (Windows-1255)"
+#: ../data/preferences_dialog.ui.h:149
+msgid "CDDB"
+msgstr "CDDB"
-#: ../src/charset.c:73
-msgid "Japanese (EUC-JP)"
-msgstr "Japansk (EUC-JP)"
+#: ../data/preferences_dialog.ui.h:150
+msgid "Confirmation"
+msgstr "Bekreftelse"
-#: ../src/charset.c:74
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japansk (ISO-2022-JP)"
+#: ../data/preferences_dialog.ui.h:151
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:118
+msgid "Confirm before quitting the application"
+msgstr "Bekreft avslutning av program"
-#: ../src/charset.c:75
-msgid "Japanese (Shift_JIS)"
-msgstr "Japansk (Shift_JIS)"
+#: ../data/preferences_dialog.ui.h:152
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:119
+msgid ""
+"Whether to ask for confirmation from the user before quitting the application"
+msgstr "Om brukeren skal bes om bekreftelse før programmet avsluttes"
-#: ../src/charset.c:76
-msgid "Korean (EUC-KR)"
-msgstr "Koreansk (EUC-KR)"
+#: ../data/preferences_dialog.ui.h:153
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:120
+msgid "Confirm before writing tags"
+msgstr "Bekreft lagring av tagger"
-#: ../src/charset.c:77
-msgid "Nordic (ISO-8859-10)"
-msgstr "Nordisk (ISO-8859-10)"
+#: ../data/preferences_dialog.ui.h:154
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:121
+msgid ""
+"Whether to ask for confirmation from the user before writing tags to audio "
+"files"
+msgstr "Om brukeren skal bes om bekreftelse før tagger lagres i lydfiler"
-#: ../src/charset.c:78
-msgid "South European (ISO-8859-3)"
-msgstr "Sør-europeisk (ISO-8859-3)"
+#: ../data/preferences_dialog.ui.h:155
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:122
+msgid "Confirm before renaming a file"
+msgstr "Bekreft endring av filnavn"
-#: ../src/charset.c:79
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
+#: ../data/preferences_dialog.ui.h:156
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:123
+msgid "Whether to ask for confirmation from the user before renaming a file"
+msgstr "Om brukeren skal bes om bekreftelse før filer får nye navn"
+
+#: ../data/preferences_dialog.ui.h:157
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:126
+msgid "Confirm before deleting a file"
+msgstr "Bekreft sletting av filer"
+
+#: ../data/preferences_dialog.ui.h:158
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:127
+msgid "Whether to ask for confirmation from the user before deleting a file"
+msgstr "Om brukeren skal bes om bekreftelse før filer slettes"
+
+#: ../data/preferences_dialog.ui.h:159
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:124
+msgid "Confirm before writing a playlist"
+msgstr "Bekreft lagring av spilleliste"
+
+#: ../data/preferences_dialog.ui.h:160
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:125
+msgid "Whether to ask for confirmation from the user before writing a playlist"
+msgstr "Om brukeren skal bes om bekreftelse før spillelister lagres"
+
+#: ../data/preferences_dialog.ui.h:161
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:128
+msgid "Confirm before losing unsaved changes to files"
+msgstr "Bekreft forkasting av ulagrede filendringer"
+
+#: ../data/preferences_dialog.ui.h:162
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:129
+msgid ""
+"Whether to ask for confirmation from the user before performing an operation "
+"that would lose unsaved changes on files"
+msgstr ""
+"Om brukeren bes om å bekrefte handlinger som fører til at endringer som ikke "
+"er lagret går tapt"
-#: ../src/charset.c:80
-msgid "Turkish (IBM-857)"
-msgstr "Tyrkisk (IBM-857)"
+#: ../data/preferences_dialog.ui.h:163
+msgid "Scanner Dialog"
+msgstr "Skanner-dialogvindu"
-#: ../src/charset.c:81
-msgid "Turkish (ISO-8859-9)"
-msgstr "Tyrkisk (ISO-8859-9)"
+#: ../data/preferences_dialog.ui.h:164
+msgid "Show the scanner dialog on startup"
+msgstr "Åpne skanner-dialogvindu når programmet starter"
-#: ../src/charset.c:82
-msgid "Turkish (Windows-1254)"
-msgstr "Tyrkisk (Windows-1254)"
+#: ../data/preferences_dialog.ui.h:165
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:202
+msgid "Whether to show the scanner window on application startup"
+msgstr "Om skanner-dialogvinduet skal vises når programmet starter"
-#. {N_("Unicode (UTF-7)"), "UTF-7" },
-#: ../src/charset.c:84
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
+#: ../data/preferences_dialog.ui.h:166
+msgid "Application"
+msgstr "Program"
-#. {N_("Unicode (UTF-16BE)"), "UTF-16BE" },
-#. {N_("Unicode (UTF-16LE)"), "UTF-16LE" },
-#. {N_("Unicode (UTF-32BE)"), "UTF-32BE" },
-#. {N_("Unicode (UTF-32LE)"), "UTF-32LE" },
-#: ../src/charset.c:91
-msgid "Vietnamese (VISCII)"
-msgstr "Vietnamesisk (VISCII)"
+#: ../data/scan_dialog.ui.h:1
+msgid ""
+"Select or type in a mask using codes (see Legend) to parse filename and "
+"directory. Used to fill in tag fields"
+msgstr ""
+"Velg eller skriv inn en maske ved å bruke koder (se Forklaring) for tolkning "
+"av fil- og mappenavn. Brukes til å fylle ut taggfelter"
-#: ../src/charset.c:92
-msgid "Vietnamese (Windows-1258)"
-msgstr "Vietnamesisk (Windows-1258)"
+#: ../data/scan_dialog.ui.h:2
+msgid "Fill tag preview"
+msgstr "Forhåndsvis utfylling av tagg"
-#: ../src/charset.c:93
-msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "Visuelt hebraisk (ISO-8859-8)"
+#: ../data/scan_dialog.ui.h:3
+msgid "Mask Editor"
+msgstr "Maskebehandler"
-#: ../src/charset.c:94
-msgid "Western (IBM-850)"
-msgstr "Vestlig (IBM-850)"
+#: ../data/scan_dialog.ui.h:4
+msgid "Create a new mask"
+msgstr "Lag ny maske"
-#: ../src/charset.c:95
-msgid "Western (ISO-8859-1)"
-msgstr "Vestlig (ISO-8859-1)"
+#: ../data/scan_dialog.ui.h:5
+msgid "Move the selected mask up"
+msgstr "Flytt valgt maske opp"
-#: ../src/charset.c:96
-msgid "Western (ISO-8859-15)"
-msgstr "Vestlig (ISO-8859-15)"
+#: ../data/scan_dialog.ui.h:6
+msgid "Move the selected mask down"
+msgstr "Flytt valgt maske ned"
-#: ../src/charset.c:97
-msgid "Western (Windows-1252)"
-msgstr "Vestlig (Windows-1252)"
+#: ../data/scan_dialog.ui.h:7
+msgid "Duplicate the selected mask"
+msgstr "Lag en kopi av valgt maske"
-#: ../src/charset.c:511
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "Klarte ikke å konvertere filnavnet «%s» til UTF-8 (%s)."
+#: ../data/scan_dialog.ui.h:8
+msgid "Add default masks"
+msgstr "Legg til standardmasker"
-#: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
-msgid "Invalid UTF-8"
-msgstr "Ugyldig UTF-8"
+#: ../data/scan_dialog.ui.h:9
+msgid "Remove the selected mask"
+msgstr "Fjern valgt maske"
-#: ../src/charset.c:610
-#, c-format
-msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
-msgstr "Klarte ikke å konvertere UTF-8-strengen «%s» til filnavn-koding (%s)."
+#: ../data/scan_dialog.ui.h:10
+msgid "Save masks"
+msgstr "Lagre masker"
-#: ../src/charset.c:673
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "Klarte ikke å konverter strengen «%s» til UTF-8 (%s)."
+#: ../data/scan_dialog.ui.h:11
+msgid "Legend"
+msgstr "Forklaring"
-#. Starting messages
-#: ../src/easytag.c:185
-#, c-format
-msgid "Starting EasyTAG version %s (PID: %d)…"
-msgstr "Starter EasyTAG versjon %s (PID: %d) …"
+#: ../data/scan_dialog.ui.h:13
+#, no-c-format
+msgid "%a: artist"
+msgstr "%a: artist"
-#: ../src/easytag.c:187
-#, c-format
-msgid "Using libid3tag version %s"
-msgstr "Bruker libid3tag versjon %s"
+#: ../data/scan_dialog.ui.h:15
+#, no-c-format
+msgid "%a: album artist"
+msgstr "%a: albumartist"
-#: ../src/easytag.c:190
-#, c-format
-msgid "Using id3lib version %d.%d.%d"
-msgstr "Bruker id3lib versjon %d.%d.%d"
+#: ../data/scan_dialog.ui.h:17
+#, no-c-format
+msgid "%b: album"
+msgstr "%b: album"
-#: ../src/easytag.c:196
-#, c-format
-msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
-msgstr "Variabelen EASYTAGLANG er definert. Velger regioninnstillinga «%s»"
+#: ../data/scan_dialog.ui.h:19
+#, no-c-format
+msgid "%c: comment"
+msgstr "%c: kommentar"
-#: ../src/easytag.c:198
-#, c-format
-msgid "Setting locale: '%s'"
-msgstr "Velger regioninnstilling «%s»"
+#: ../data/scan_dialog.ui.h:21
+#, no-c-format
+msgid "%p: composer"
+msgstr "%p: komponist"
-#: ../src/easytag.c:203
-#, c-format
-msgid "Currently using locale '%s' (and eventually '%s')"
-msgstr "Du bruker nå regioninnstillinga «%s» (og eventuelt «%s»)"
+#: ../data/scan_dialog.ui.h:23
+#, no-c-format
+msgid "%r: copyright"
+msgstr "%r: opphavsrett"
-#: ../src/easytag.c:210
-#, fuzzy
-msgid "Unable to create setting directories"
-msgstr "Klarte ikke å lage målmapper"
+#: ../data/scan_dialog.ui.h:25
+#, no-c-format
+msgid "%d: disc number"
+msgstr "%d: platenummer"
-#: ../src/easytag.c:427 ../src/et_core.c:638 ../src/et_core.c:650
-#, c-format
-msgid "Error while querying information for file: '%s' (%s)"
-msgstr "Det oppstod en feil ved etterspørring av informasjon om fila «%s» (%s)"
+#: ../data/scan_dialog.ui.h:27
+#, no-c-format
+msgid "%e: encoded by"
+msgstr "%e: kodet av"
-#: ../src/easytag.c:490
-#, c-format
-msgid "Cannot open path '%s'"
-msgstr "Klarte ikke å åpne stien «%s»"
+#: ../data/scan_dialog.ui.h:29
+#, no-c-format
+msgid "%g: genre"
+msgstr "%g: sjanger"
-#.
-#. * Browser
-#.
-#: ../src/easytag.c:582 ../src/prefs.c:142
-msgid "Browser"
-msgstr "Utforsker"
+#: ../data/scan_dialog.ui.h:31
+#, no-c-format
+msgid "%i: ignored"
+msgstr "%i: ignorert"
-#: ../src/easytag.c:604 ../src/et_core.c:2869
-msgid "File"
-msgstr "Fil"
+#: ../data/scan_dialog.ui.h:33
+#, no-c-format
+msgid "%l: number of tracks"
+msgstr "%l: antall spor"
-#. Default values are MPs data
-#. Nothing to display
-#. gtk_label_set_text(GTK_LABEL(VersionLabel),"");
-#. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
-#. Version changed to encoder version
-#. Encoder version
-#: ../src/easytag.c:636 ../src/easytag.c:4284 ../src/flac_header.c:201
-#: ../src/monkeyaudio_header.c:96 ../src/musepack_header.c:98
-#: ../src/ogg_header.c:389 ../src/opus_header.c:221 ../src/wavpack_header.c:72
-#, c-format
-msgid "Encoder:"
-msgstr "Kodeprogram:"
+#: ../data/scan_dialog.ui.h:35
+#, no-c-format
+msgid "%o: original artist"
+msgstr "%o: oppr. artist"
-#: ../src/easytag.c:644
-msgid "Bitrate:"
-msgstr "Bitfrekvens:"
+#: ../data/scan_dialog.ui.h:37
+#, no-c-format
+msgid "%n: track"
+msgstr "%n: spornummer"
-#. Translators: Please try to keep this string as short as possible as it
-#. * is shown in a narrow column.
-#: ../src/easytag.c:654
-msgid "Frequency:"
-msgstr "Frekvens:"
+#: ../data/scan_dialog.ui.h:39
+#, no-c-format
+msgid "%t: title"
+msgstr "%t: tittel"
-#. Mode
-#: ../src/easytag.c:665 ../src/easytag.c:4288 ../src/mpeg_header.c:216
-msgid "Mode:"
-msgstr "Modus:"
+#: ../data/scan_dialog.ui.h:41
+#, no-c-format
+msgid "%u: URL"
+msgstr "%u: nettadresse"
-#: ../src/easytag.c:672
-msgid "Size:"
-msgstr "Størrelse:"
+#: ../data/scan_dialog.ui.h:43
+#, no-c-format
+msgid "%x: number of discs"
+msgstr "%x: antall plater"
-#: ../src/easytag.c:679
-msgid "Duration:"
-msgstr "Varighet:"
+#: ../data/scan_dialog.ui.h:45
+#, no-c-format
+msgid "%y: year"
+msgstr "%y: år"
-#. Main Frame
-#: ../src/easytag.c:726 ../src/et_core.c:2799
-msgid "Tag"
-msgstr "Tagg"
+#: ../data/scan_dialog.ui.h:46
+msgid "Fill Tag"
+msgstr "Fyll ut tagg"
-#.
-#. * 1 - Page for common tag fields
-#.
-#: ../src/easytag.c:748
-msgid "Common"
-msgstr "Vanlig"
+#: ../data/scan_dialog.ui.h:47
+msgid "Prefix mask with current directory"
+msgstr "Bruk gjeldende mappe som prefiks i maska"
-#. Title
-#: ../src/easytag.c:755
-msgid "Title:"
-msgstr "Tittel:"
+#: ../data/scan_dialog.ui.h:48
+msgid ""
+"Select or type in a mask using codes (see Legend) to parse tag fields. Used "
+"to rename the file.\n"
+" Use ‘/’ to make directories. If the first character is ‘/’, it is an "
+"absolute path, otherwise is relative to the old path"
+msgstr ""
+"Velg eller skriv inn en maske ved å bruke koder (se forklaring) som tolker "
+"taggfelt. Dette brukes til å gi filer nytt navn.\n"
+"Bruk «/» for å lage mapper. Hvis første tegn i stien er «/», regnes stien "
+"som en absolutt sti. Ellers er stien relativ til opprinnelig mappe"
-#: ../src/easytag.c:769
-msgid "Tag selected files with this title"
-msgstr "Tagg valgte filer med denne tittelen"
+#: ../data/scan_dialog.ui.h:50
+msgid "Rename file preview"
+msgstr "Forhåndsvisning av nytt filnavn"
-#. Artist
-#: ../src/easytag.c:774
-msgid "Artist:"
-msgstr "Artist:"
+#. Only filename changed
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:582
+msgid "Rename File"
+msgstr "Gi nytt navn til fil"
-#: ../src/easytag.c:788
-msgid "Tag selected files with this artist"
-msgstr "Tagg valgte filer med denne artisten"
+#: ../data/scan_dialog.ui.h:52
+msgid "Tag Fields"
+msgstr "Taggfelt"
-#. Album Artist
-#: ../src/easytag.c:793
-msgid "Album artist:"
-msgstr "Albumartist:"
+#: ../data/scan_dialog.ui.h:54
+msgid "Process filename"
+msgstr "Behandle filnavn"
-#: ../src/easytag.c:807
-msgid "Tag selected files with this album artist"
-msgstr "Tagg valgte filer med denne albumartisten"
+#: ../data/scan_dialog.ui.h:56
+msgid "Process title field"
+msgstr "Behandle tittelfelt"
-#. Album
-#: ../src/easytag.c:812
-msgid "Album:"
-msgstr "Album"
+#: ../data/scan_dialog.ui.h:58
+msgid "Process artist field"
+msgstr "Behandle artist-felt"
-#: ../src/easytag.c:826
-msgid "Tag selected files with this album name"
-msgstr "Tagg valgte filer med dette albumnavnet"
+#: ../data/scan_dialog.ui.h:61
+msgid "Process album field"
+msgstr "Behandle album-felt"
-#. Disc Number
-#: ../src/easytag.c:831
-msgid "CD:"
-msgstr "CD:"
+#: ../data/scan_dialog.ui.h:63
+msgid "Process genre field"
+msgstr "Behandle sjanger-felt"
-#: ../src/easytag.c:848
-msgid "Tag selected files with this disc number"
-msgstr "Tagg valgte filer med dette platenummeret"
+#: ../data/scan_dialog.ui.h:65
+msgid "Process comment field"
+msgstr "Behandle kommentarfelt"
-#. Year
-#: ../src/easytag.c:853
-msgid "Year:"
-msgstr "År:"
+#: ../data/scan_dialog.ui.h:67
+msgid "Process composer field"
+msgstr "Behandle komponist-felt"
-#: ../src/easytag.c:873
-msgid "Tag selected files with this year"
-msgstr "Tagg valgte filer med dette året"
+#: ../data/scan_dialog.ui.h:68
+msgid "Orig. Artist"
+msgstr "Oppr. artist:"
-#: ../src/easytag.c:887
-msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
-msgstr ""
-"Nummerer valgte spor i rekkefølge. Tallet begynner på 01 i hver undermappe"
+#: ../data/scan_dialog.ui.h:69
+msgid "Process original artist field"
+msgstr "Behandle opprinnelig artist-felt"
-#. To have enough space to display the icon
-#. To have enough space to display the icon
-#: ../src/easytag.c:896
-msgid "Track #:"
-msgstr "Spornummer:"
+#: ../data/scan_dialog.ui.h:71
+msgid "Process copyright field"
+msgstr "Behandle opphavsrett-felt"
-#: ../src/easytag.c:927
-msgid ""
-"Set the number of files, in the same directory of the displayed file, to the "
-"selected tracks."
-msgstr ""
-"Velg antall i filer (i samme mappe som fila som vises) som antall spor-tagg "
-"for valgte spor."
+#: ../data/scan_dialog.ui.h:73
+msgid "Process URL field"
+msgstr "Behandle nettadresse-felt"
-#: ../src/easytag.c:947
-msgid "Tag selected files with this number of tracks"
-msgstr "Tagg valgte filer med dette antallet spor"
+#: ../data/scan_dialog.ui.h:75
+msgid "Process encoded-by field"
+msgstr "Behandle kodeprogram-felt"
-#. Genre
-#: ../src/easytag.c:951
-msgid "Genre:"
-msgstr "Sjanger:"
+#: ../data/scan_dialog.ui.h:76
+msgid "Capitalization"
+msgstr "Store bokstaver"
-#: ../src/easytag.c:979
-msgid "Tag selected files with this genre"
-msgstr "Tagg valgte filer med denne sjangeren"
+#: ../data/scan_dialog.ui.h:77
+msgid "Capitalize all"
+msgstr "Bare store bokstaver"
-#. Comment
-#: ../src/easytag.c:984
-msgid "Comment:"
-msgstr "Kommentar:"
+#: ../data/scan_dialog.ui.h:78 ../data/org.gnome.EasyTAG.gschema.xml.h:144
+msgid ""
+"Whether to upper-case all characters of the tag when processing tag fields"
+msgstr "Om alle bokstaver i tagger skal bli store ved behandling av taggfelt"
-#: ../src/easytag.c:1011
-msgid "Tag selected files with this comment"
-msgstr "Tagg valgte filer med denne kommentaren"
+#: ../data/scan_dialog.ui.h:79
+msgid "Lowercase all"
+msgstr "Gjør alle bokstaver små"
-#. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
-#. Composer (name of the composers)
-#: ../src/easytag.c:1018
-msgid "Composer:"
-msgstr "Komponist:"
+#: ../data/scan_dialog.ui.h:80 ../data/org.gnome.EasyTAG.gschema.xml.h:142
+msgid ""
+"Whether to lower-case all characters of the tag when processing tag fields"
+msgstr "Om alle bokstaver i tagger skal bli små ved behandling av taggfelt"
-#: ../src/easytag.c:1032
-msgid "Tag selected files with this composer"
-msgstr "Tagg valgte filer med denne komponisten"
+#: ../data/scan_dialog.ui.h:81
+msgid "Capitalize first letter"
+msgstr "Gjør første bokstav til stor bokstav"
-#. Translators: Original Artist / Performer. Please try to keep this string
-#. * as short as possible, as it must fit into a narrow column.
-#: ../src/easytag.c:1039
-msgid "Orig. artist:"
-msgstr "Oppr. artist:"
+#: ../data/scan_dialog.ui.h:82 ../data/org.gnome.EasyTAG.gschema.xml.h:146
+msgid ""
+"Whether to upper-case the first letter of the tag when processing tag fields"
+msgstr "Om første bokstav i tagger skal bli små ved behandling av taggfelt"
-#: ../src/easytag.c:1053
-msgid "Tag selected files with this original artist"
-msgstr "Tagg valgte filer med denne opprinnelige artisten"
+#: ../data/scan_dialog.ui.h:83
+msgid "Capitalize the first letter of each word"
+msgstr "Gjør første bokstav i hvert ord til stor bokstav"
-#. Copyright
-#: ../src/easytag.c:1059
-msgid "Copyright:"
-msgstr "Opphavsrett:"
+#: ../data/scan_dialog.ui.h:84 ../data/org.gnome.EasyTAG.gschema.xml.h:148
+msgid ""
+"Whether to upper-case the first letter of each word when processing tag "
+"fields"
+msgstr ""
+"Om første bokstav i hvert ord skal gjøres stor ved behandling av taggfelt"
-#: ../src/easytag.c:1073
-msgid "Tag selected files with this copyright"
-msgstr "Tagg valgte filer med denne opphavsrettsmerknaden"
+#: ../data/scan_dialog.ui.h:85
+msgid "Detect Roman numerals"
+msgstr "Oppdag romerske numre"
-#. URL
-#: ../src/easytag.c:1079
-msgid "URL:"
-msgstr "Nettadresse:"
+#: ../data/scan_dialog.ui.h:86 ../data/org.gnome.EasyTAG.gschema.xml.h:152
+msgid ""
+"Whether to detect Roman numerals when applying upper-case conversions while "
+"processing tag fields"
+msgstr ""
+"Om romerske tall skal oppdages og evt. gjøres om til store bokstaver ved "
+"behandling av taggfelt"
-#: ../src/easytag.c:1093
-msgid "Tag selected files with this URL"
-msgstr "Tagg valgte filer med denne nettadressen"
+#: ../data/scan_dialog.ui.h:87
+msgid "Do not change capitalization"
+msgstr "Ikke endre små og store bokstaver"
-#. Encoded by
-#: ../src/easytag.c:1099
-msgid "Encoded by:"
-msgstr "Kodet av:"
+#: ../data/scan_dialog.ui.h:88
+msgid "Spaces Conversions"
+msgstr "Mellomrom-konverteringer"
-#: ../src/easytag.c:1113
-msgid "Tag selected files with this encoder name"
-msgstr "Tagg valgte filer med dette kodeprogram-navnet"
+#: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153
+#: ../src/tag_area.c:878
+msgid "Remove spaces"
+msgstr "Fjern mellomrom"
-#.
-#. * 2 - Page for extra tag fields
-#.
-#: ../src/easytag.c:1146 ../src/et_core.c:3241 ../src/et_core.c:3244
-msgid "Images"
-msgstr "Bilder"
+#: ../data/scan_dialog.ui.h:90 ../data/org.gnome.EasyTAG.gschema.xml.h:154
+msgid "Whether to remove all spaces when processing tag fields"
+msgstr "Om alle mellomrom skal fjernes ved behandling av taggfelt"
-#: ../src/easytag.c:1170
-msgid "You can use drag and drop to add an image"
-msgstr "Du kan dra og slippe for å legge til et bilde"
+#: ../data/scan_dialog.ui.h:91
+msgid "Insert a space before uppercase letters"
+msgstr "Sett inn mellomrom før store bokstaver"
-#: ../src/easytag.c:1217
-msgid "Add images to the tag"
-msgstr "Legg til bilder i taggen"
+#: ../data/scan_dialog.ui.h:92 ../data/org.gnome.EasyTAG.gschema.xml.h:156
+msgid ""
+"Whether to insert spaces before capital letters when processing tag fields"
+msgstr ""
+"Om det skal settes inn mellomrom før store bokstaver ved behandling av "
+"taggfelt"
-#: ../src/easytag.c:1235
-msgid "Remove selected images from the tag"
-msgstr "Fjern valgte bilder fra taggen"
+#: ../data/scan_dialog.ui.h:93
+msgid "Remove duplicate spaces and underscores"
+msgstr "Fjern doble mellomrom og understreker"
-#: ../src/easytag.c:1249
-msgid "Save the selected images to files"
-msgstr "Lagre valgte bilder til filer"
+#: ../data/scan_dialog.ui.h:94 ../data/org.gnome.EasyTAG.gschema.xml.h:158
+msgid ""
+"Whether to remove duplicate spaces and underscores when processing tag fields"
+msgstr ""
+"Om doble forekomster av mellomrom og understrek skal fjernes ved behandling "
+"av taggfelt"
-#: ../src/easytag.c:1260
-msgid "Edit image properties"
-msgstr "Rediger bildeegenskaper"
+#: ../data/scan_dialog.ui.h:95
+msgid "Do not change word separators"
+msgstr "Ikke endre orddelere"
-#: ../src/easytag.c:1274
-msgid "Tag selected files with these images"
-msgstr "Tagg valgte filer med disse bildene"
+#: ../data/scan_dialog.ui.h:96
+msgid "Character Conversions"
+msgstr "Tegnkonvertering"
-#: ../src/easytag.c:1332
-#, c-format
-msgid "Selected files tagged with title '%s'."
-msgstr "Valgte filer er tagget med «%s» som tittel."
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:834
+#, no-c-format
+msgid "Convert ‘_’ and ‘%20’ to spaces"
+msgstr "Bytt ut «_» og «%20» med mellomrom"
-#: ../src/easytag.c:1334
-msgid "Removed title from selected files."
-msgstr "Fjernet tittel fra valgte filer."
+#: ../data/scan_dialog.ui.h:100
+#, no-c-format
+msgid ""
+"The underscore character or the string ‘%20’ is replaced by one space. "
+"Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"
+msgstr ""
+"Understrek-tegnet eller strengen «%20» erstattes med enkelt mellomrom. For "
+"eksempel blir «Tekst%20i%20en_oppføring» endret til «Tekst i en oppføring»."
-#: ../src/easytag.c:1349
-#, c-format
-msgid "Selected files tagged with artist '%s'."
-msgstr "Valgte filer er tagget med «%s» som artist."
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:840
+msgid "Convert spaces to underscores"
+msgstr "Erstatt mellomrom med understrek"
-#: ../src/easytag.c:1351
-msgid "Removed artist from selected files."
-msgstr "Fjernet artist fra valgte filer."
+#: ../data/scan_dialog.ui.h:102
+msgid ""
+"The space character is replaced by one underscore character. Example, "
+"before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"
+msgstr ""
+"Mellomrom-tegn erstattes av understrek-tegn. For eksempel endres «Tekst i en "
+"oppføring» til «Tekst_i_en_oppføring»."
-#: ../src/easytag.c:1365
-#, c-format
-msgid "Selected files tagged with album artist '%s'."
-msgstr "Valgte filer er tagget med «%s» som albumartist."
+#: ../data/scan_dialog.ui.h:103
+msgid "Convert:"
+msgstr "Konverter:"
-#: ../src/easytag.c:1367
-msgid "Removed album artist from selected files."
-msgstr "Fjernet albumartist fra valgte filer."
+#: ../data/scan_dialog.ui.h:104
+msgid "Replace a string by another one. Note that the search is case sensitive"
+msgstr ""
+"Erstatt en streng med en annen. Merk at søket skiller mellom små og store "
+"bokstaver."
-#: ../src/easytag.c:1382
-#, c-format
-msgid "Selected files tagged with album '%s'."
-msgstr "Valgte filer er tagget med «%s» som album."
+#: ../data/scan_dialog.ui.h:105
+msgid "to: "
+msgstr "til:"
-#: ../src/easytag.c:1384
-msgid "Removed album name from selected files."
-msgstr "Fjernet albumnavn fra valgte filer."
+#: ../data/scan_dialog.ui.h:106
+msgid "Do not convert"
+msgstr "Ikke konverter"
-#: ../src/easytag.c:1421
-#, c-format
-msgid "Selected files tagged with disc number '%s/%s'."
-msgstr "Valgte filer er tagget med «%s/%s» som platenummer."
+#: ../data/scan_dialog.ui.h:108
+msgid "Show / Hide Masks Editor"
+msgstr "Vis/skjul maskebehandler"
-#: ../src/easytag.c:1426
-#, c-format
-msgid "Selected files tagged with disc number like 'xx'."
-msgstr "Valgte filer er tagget med platenummer som «xx»."
+#: ../data/scan_dialog.ui.h:109
+msgid "Show / Hide Legend"
+msgstr "Vis/skjul forklaring"
-#: ../src/easytag.c:1431
-msgid "Removed disc number from selected files."
-msgstr "Fjernet platenummer fra valgte filer."
+#: ../data/scan_dialog.ui.h:110
+msgid "Scanner Preferences"
+msgstr "Skannerinnstillinger"
-#: ../src/easytag.c:1447
-#, c-format
-msgid "Selected files tagged with year '%s'."
-msgstr "Valgte filer er tagget med «%s» som år."
+#: ../data/search_dialog.ui.h:1
+msgid "Search:"
+msgstr "Søk:"
-#: ../src/easytag.c:1449
-msgid "Removed year from selected files."
-msgstr "Fjernet år fra valgte filer."
+#: ../data/search_dialog.ui.h:2
+msgid ""
+"Type the text to search for in the file list, or leave the field empty to "
+"display all files"
+msgstr ""
+"Skriv inn ordet du vil søke etter, eller la feltet stå tomt for å vise alle "
+"filer."
-#: ../src/easytag.c:1475 ../src/easytag.c:1565
-#, c-format
-msgid "Selected files tagged with track like 'xx/%s'."
-msgstr "Valgte filer er tagget med spornummer som «xx/%s»."
+#: ../data/search_dialog.ui.h:3
+msgid "_Find"
+msgstr "_Finn"
-#: ../src/easytag.c:1478
-#, c-format
-msgid "Selected files tagged with track like 'xx'."
-msgstr "Valgte filer er tagget med spornummer som «xx»."
+#: ../data/search_dialog.ui.h:4
+msgid "In:"
+msgstr "I:"
-#: ../src/easytag.c:1482 ../src/easytag.c:1568
-msgid "Removed track number from selected files."
-msgstr "Fjernet spornummer fra valgte filer."
+#. This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Filename'.
+#: ../data/search_dialog.ui.h:6
+msgid "the Filename"
+msgstr "filnavnet"
-#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1538
-#, c-format
-msgid "Selected tracks numbered sequentially."
-msgstr "Valgte spor er nummerert i rekkefølge."
+#. This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Tag'.
+#: ../data/search_dialog.ui.h:8
+msgid "the Tag"
+msgstr "taggen"
-#: ../src/easytag.c:1584
-#, c-format
-msgid "Selected files tagged with genre '%s'."
-msgstr "Valgte filer er tagget med «%s» som sjanger."
+#: ../data/search_dialog.ui.h:9
+msgid "Case sensitive"
+msgstr "Skill mellom små og store bokstaver"
-#: ../src/easytag.c:1586
-msgid "Removed genre from selected files."
-msgstr "Fjernet sjanger fra valgte filer."
+#: ../data/search_dialog.ui.h:16
+msgid "CD"
+msgstr "CD"
-#: ../src/easytag.c:1608
-#, c-format
-msgid "Selected files tagged with comment '%s'."
-msgstr "Valgte filer er tagget med «%s» som kommentar."
+#: ../data/tag_area.ui.h:1
+msgid "Image Type"
+msgstr "Bildetype"
-#: ../src/easytag.c:1610
-msgid "Removed comment from selected files."
-msgstr "Fjernet kommentarer fra valgte filer."
+#: ../data/tag_area.ui.h:2 ../src/picture.c:269
+msgid "Description"
+msgstr "Synkende, etter beskrivelse"
-#: ../src/easytag.c:1624
-#, c-format
-msgid "Selected files tagged with composer '%s'."
-msgstr "Valgte filer er tagget med «%s» som komponist."
+#: ../data/tag_area.ui.h:4
+msgid "_Accept"
+msgstr "_Godta"
-#: ../src/easytag.c:1626
-msgid "Removed composer from selected files."
-msgstr "Fjernet komponist fra valgte filer."
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3019
+msgid "Tag"
+msgstr "Tagg"
-#: ../src/easytag.c:1641
-#, c-format
-msgid "Selected files tagged with original artist '%s'."
-msgstr "Valgte filer er tagget med «%s» som opprinnelig artist."
+#: ../data/tag_area.ui.h:6
+msgid "Title:"
+msgstr "Tittel:"
-#: ../src/easytag.c:1643
-msgid "Removed original artist from selected files."
-msgstr "Fjernet opprinnelig artist fra valgte filer."
+#: ../data/tag_area.ui.h:7
+msgid "Tag selected files with this title"
+msgstr "Tagg valgte filer med denne tittelen"
-#: ../src/easytag.c:1658
-#, c-format
-msgid "Selected files tagged with copyright '%s'."
-msgstr "Valgte filer er tagget med «%s» som opphavsrettsmerknad."
+#: ../data/tag_area.ui.h:8
+msgid "Artist:"
+msgstr "Artist:"
-#: ../src/easytag.c:1660
-msgid "Removed copyright from selected files."
-msgstr "Fjernet opphavsrettsinfo fra valgte filer."
+#: ../data/tag_area.ui.h:9
+msgid "Tag selected files with this artist"
+msgstr "Tagg valgte filer med denne artisten"
-#: ../src/easytag.c:1675
-#, c-format
-msgid "Selected files tagged with URL '%s'."
-msgstr "Valgte filer er tagget med «%s» som nettadresse."
+#: ../data/tag_area.ui.h:10
+msgid "Album artist:"
+msgstr "Albumartist:"
-#: ../src/easytag.c:1677
-msgid "Removed URL from selected files."
-msgstr "Fjernet nettadresse fra valgte filer."
+#: ../data/tag_area.ui.h:11
+msgid "Tag selected files with this album artist"
+msgstr "Tagg valgte filer med denne albumartisten"
-#: ../src/easytag.c:1692
-#, c-format
-msgid "Selected files tagged with encoder name '%s'."
-msgstr "Valgte filer er tagget med «%s» som kodeprogram."
+#: ../data/tag_area.ui.h:12
+msgid "Album:"
+msgstr "Album"
-#: ../src/easytag.c:1694
-msgid "Removed encoder name from selected files."
-msgstr "Fjernet kodeprogram-felt fra valgte filer."
+#: ../data/tag_area.ui.h:13
+msgid "Tag selected files with this album name"
+msgstr "Tagg valgte filer med dette albumnavnet"
-#: ../src/easytag.c:1726
-msgid "Selected files tagged with images."
-msgstr "Valgte filer er tagget med bilder."
+#: ../data/tag_area.ui.h:14
+msgid "CD:"
+msgstr "CD:"
-#: ../src/easytag.c:1728
-msgid "Removed images from selected files."
-msgstr "Fjernet bilder fra valgte filer."
+#: ../data/tag_area.ui.h:15
+msgid "Tag selected files with this disc number"
+msgstr "Tagg valgte filer med dette platenummeret"
-#: ../src/easytag.c:2009
-msgid "Select Mode and Mask, and redo the same action"
-msgstr "Velg modus og maske, og utfør samme handling på nytt"
+#: ../data/tag_area.ui.h:16
+msgid "Year:"
+msgstr "År:"
-#: ../src/easytag.c:2061
-msgid "All tags have been scanned"
-msgstr "Alle tagger er blitt gjennomsøkt"
+#: ../data/tag_area.ui.h:17
+msgid "Tag selected files with this year"
+msgstr "Tagg valgte filer med dette året"
-#: ../src/easytag.c:2117
-msgid "All tags have been removed"
-msgstr "Alle tagger er fjernet"
+#: ../data/tag_area.ui.h:18
+msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory"
+msgstr ""
+"Nummerer valgte spor i rekkefølge. Tallet begynner på 01 i hver undermappe"
-#: ../src/easytag.c:2422
-#, c-format
-msgid "A file was changed by an external program"
-msgid_plural "%d files were changed by an external program."
-msgstr[0] "En fil ble endret av et eksternt program"
-msgstr[1] "%d filer ble endret av et eksternt program"
+#: ../data/tag_area.ui.h:19
+msgid "Track #:"
+msgstr "Spornummer:"
-#: ../src/easytag.c:2427
-msgid "Do you want to continue saving the file?"
-msgstr "Er du sikker på at du vil lagre fila?"
+#: ../data/tag_area.ui.h:20
+msgid ""
+"Set the number of files, in the same directory of the displayed file, to the "
+"selected tracks"
+msgstr "Bruk antall filer i tilhørende mappe som antall spor-tagg."
-#: ../src/easytag.c:2485 ../src/easytag.c:2505
-msgid "Saving files was stopped"
-msgstr "Fillagring ble stoppet"
+#: ../data/tag_area.ui.h:21
+msgid "Tag selected files with this number of tracks"
+msgstr "Tagg valgte filer med dette antallet spor"
-#: ../src/easytag.c:2507
-msgid "All files have been saved"
-msgstr "Alle filer er lagret"
+#: ../data/tag_area.ui.h:22
+msgid "Genre:"
+msgstr "Sjanger:"
-#: ../src/easytag.c:2642
-#, c-format
-msgid "Cannot delete file (%s)"
-msgstr "Klarte ikke å slette fil (%s)"
+#: ../data/tag_area.ui.h:23
+msgid "Comment:"
+msgstr "Kommentar:"
-#: ../src/easytag.c:2663
-msgid "Files have been partially deleted"
-msgstr "Filer er delvis slettet"
+#: ../data/tag_area.ui.h:24
+msgid "Tag selected files with this comment"
+msgstr "Tagg valgte filer med denne kommentaren"
-#: ../src/easytag.c:2665
-msgid "All files have been deleted"
-msgstr "Alle filer er slettet"
+#: ../data/tag_area.ui.h:25
+msgid "Composer:"
+msgstr "Komponist:"
-#: ../src/easytag.c:2781
-#, c-format
-msgid "Do you want to write the tag of file '%s'?"
-msgstr "Er du sikker på at du vil skrive taggen til fila «%s»?"
+#: ../data/tag_area.ui.h:26
+msgid "Tag selected files with this composer"
+msgstr "Tagg valgte filer med denne komponisten"
-#: ../src/easytag.c:2783
-msgid "Confirm Tag Writing"
-msgstr "Bekreft taggskriving"
+#: ../data/tag_area.ui.h:27
+msgid "Orig. artist:"
+msgstr "Oppr. artist:"
-#: ../src/easytag.c:2788 ../src/easytag.c:2908 ../src/easytag.c:3225
-msgid "Repeat action for the remaining files"
-msgstr "Gjenta handling for filene som gjenstår"
+#: ../data/tag_area.ui.h:28
+msgid "Tag selected files with this original artist"
+msgstr "Tagg valgte filer med denne opprinnelige artisten"
-#. Directories and filename changed
-#: ../src/easytag.c:2872 ../src/scan_dialog.c:183
-msgid "Rename File and Directory"
-msgstr "Gi nytt navn til fil og mappe"
+#: ../data/tag_area.ui.h:29
+msgid "Copyright:"
+msgstr "Opphavsrett:"
-#: ../src/easytag.c:2873
-msgid "File and directory rename confirmation required"
-msgstr "Navneendring av fil- og mappenavn må bekreftes"
+#: ../data/tag_area.ui.h:30
+msgid "Tag selected files with this copyright"
+msgstr "Tagg valgte filer med denne opphavsrettsmerknaden"
-#: ../src/easytag.c:2874
-#, c-format
-msgid "Do you want to rename the file and directory '%s' to '%s'?"
-msgstr "Er du sikker på at du vil endre navnet på fila og mappa «%s» til «%s»?"
+#: ../data/tag_area.ui.h:31
+msgid "URL:"
+msgstr "Nettadresse:"
-#: ../src/easytag.c:2880
-msgid "Directory rename confirmation required"
-msgstr "Navneendring av mappe må bekreftes"
+#: ../data/tag_area.ui.h:32
+msgid "Tag selected files with this URL"
+msgstr "Tagg valgte filer med denne nettadressen"
-#: ../src/easytag.c:2881
-#, c-format
-msgid "Do you want to rename the directory '%s' to '%s'?"
-msgstr "Er du sikker på at du vil gi mappa «%s» det nye navnet «%s»?"
+#: ../data/tag_area.ui.h:33
+msgid "Encoded by:"
+msgstr "Kodet av:"
-#. Only filename changed
-#: ../src/easytag.c:2887
-msgid "Rename File"
-msgstr "Gi nytt navn til fil"
+#: ../data/tag_area.ui.h:34
+msgid "Tag selected files with this encoder name"
+msgstr "Tagg valgte filer med dette kodeprogram-navnet"
-#: ../src/easytag.c:2888
-msgid "File rename confirmation required"
-msgstr "Navneendring av fil må bekreftes"
+#: ../data/tag_area.ui.h:35
+msgid "Common"
+msgstr "Vanlig"
-#: ../src/easytag.c:2889
-#, c-format
-msgid "Do you want to rename the file '%s' to '%s'?"
-msgstr "Er du sikker på at du vil endre navnet på fila «%s» til «%s»?"
+#: ../data/tag_area.ui.h:36
+msgid "You can use drag and drop to add an image"
+msgstr "Du kan dra og slippe for å legge til et bilde"
-#: ../src/easytag.c:2955
-#, c-format
-msgid "Cannot rename file '%s' to '%s'"
-msgstr "Klarte ikke å gi fila «%s» det nye navnet «%s»"
+#: ../data/tag_area.ui.h:37
+msgid "Add images to the tag"
+msgstr "Legg til bilder i taggen"
-#: ../src/easytag.c:2969
-#, c-format
-msgid "Cannot rename file '%s' to '%s': %s"
-msgstr "Klarte ikke å gi fila «%s» det nye navnet «%s». %s"
+#: ../data/tag_area.ui.h:38
+msgid "Remove selected images from the tag"
+msgstr "Fjern valgte bilder fra taggen"
-#: ../src/easytag.c:2973
-msgid "File(s) not renamed"
-msgstr "Filnavn(et/ene) ble ikke endret"
+#: ../data/tag_area.ui.h:39
+msgid "Save the selected images to files"
+msgstr "Lagre valgte bilder til filer"
-#: ../src/easytag.c:3152
-#, c-format
-msgid "Writing tag of '%s'"
-msgstr "Skriver tagg til «%s»"
+#: ../data/tag_area.ui.h:40
+msgid "Edit image properties"
+msgstr "Rediger bildeegenskaper"
-#: ../src/easytag.c:3159
-msgid "Tag(s) written"
-msgstr "Tagg(er) ble skrevet"
+#: ../data/tag_area.ui.h:41
+msgid "Tag selected files with these images"
+msgstr "Tagg valgte filer med disse bildene"
-#: ../src/easytag.c:3172
-#, c-format
-msgid "Cannot write tag in file '%s'"
-msgstr "Klarte ikke å skrive tagg til fila «%s»"
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3272 ../src/tag_area.c:3275
+msgid "Images"
+msgstr "Bilder"
-#: ../src/easytag.c:3176
-msgid "Tag Write Error"
-msgstr "Feil ved skriving av tagg"
+#: ../data/toolbar.ui.h:2
+msgid "First file"
+msgstr "Første fil"
-#: ../src/easytag.c:3222 ../src/easytag.c:3236
-#, c-format
-msgid "Do you really want to delete the file '%s'?"
-msgstr "Er du sikker på at du vil slette fila «%s»?"
+#: ../data/toolbar.ui.h:3
+msgid "_Previous File"
+msgstr "_Forrige fil"
-#: ../src/easytag.c:3228 ../src/easytag.c:3238
-msgid "Delete File"
-msgstr "Slett fil"
+#: ../data/toolbar.ui.h:4
+msgid "Previous file"
+msgstr "Forrige fil"
-#: ../src/easytag.c:3263
-#, c-format
-msgid "File '%s' deleted"
-msgstr "Fila «%s» er slettet"
+#: ../data/toolbar.ui.h:6
+msgid "Next file"
+msgstr "Neste fil"
-#: ../src/easytag.c:3398
-#, c-format
-msgid "Cannot read directory '%s'"
-msgstr "Klarte ikke å lese mappa «%s»"
+#: ../data/toolbar.ui.h:8
+msgid "Last file"
+msgstr "Siste fil"
-#: ../src/easytag.c:3402
-msgid "Directory Read Error"
-msgstr "Feil ved lesing av mappe"
+#: ../data/toolbar.ui.h:9
+msgid "_Show Scanner"
+msgstr "_Vis skanner"
-#. Read the directory recursively
-#: ../src/easytag.c:3423
-#, c-format
-msgid "Search in progress…"
-msgstr "Søker …"
+#: ../data/toolbar.ui.h:10
+msgid "Show scanner"
+msgstr "Vis skanner"
-#: ../src/easytag.c:3446 ../src/et_core.c:2876
-#, c-format
-msgid "File: '%s'"
-msgstr "Fil: «%s»"
+#: ../data/toolbar.ui.h:12
+msgid "Remove tags"
+msgstr "Fjern tagger"
-#: ../src/easytag.c:3496
-#, c-format
-msgid "Found one file in this directory and subdirectories"
-msgid_plural "Found %d files in this directory and subdirectories"
-msgstr[0] "Fant én fil i denne mappa og dens undermapper"
-msgstr[1] "Fant %d filer i denne mappa og dens undermapper"
+#: ../data/toolbar.ui.h:13
+msgid "_Undo"
+msgstr "_Angre"
-#: ../src/easytag.c:3503
-#, c-format
-msgid "Found one file in this directory"
-msgid_plural "Found %d files in this directory"
-msgstr[0] "Fant én fil i denne mappa"
-msgstr[1] "Fant %d filer i denne mappa"
+#: ../data/toolbar.ui.h:14
+msgid "Undo for file"
+msgstr "Angre per fil"
-#: ../src/easytag.c:3525
-msgid "No file found in this directory and subdirectories"
-msgstr "Fant ingen filer i denne mappa, og heller ikke i undermappene"
+#: ../data/toolbar.ui.h:15
+msgid "R_edo"
+msgstr "Gj_ør om"
-#: ../src/easytag.c:3527
-msgid "No file found in this directory"
-msgstr "Fant ingen filer i denne mappa"
+#: ../data/toolbar.ui.h:16
+msgid "Redo for file"
+msgstr "Gjenta per fil"
-#: ../src/easytag.c:3595
-#, c-format
-msgid "Error opening directory '%s' (%s)"
-msgstr "Det oppstod en feil ved åpning av mappa «%s» (%s)"
+#: ../data/toolbar.ui.h:18
+msgid "Save changes to selected files"
+msgstr "Lagre endringer i valgte filer"
-#: ../src/easytag.c:3631
-#, c-format
-msgid "Cannot read directory (%s)"
-msgstr "Klarte ikke å lese mappa (%s)"
+#: ../data/toolbar.ui.h:20
+msgid "Browse directory tree"
+msgstr "Utforsk mappehierarki"
-#: ../src/easytag.c:3651
-msgid "Searching for audio files…"
-msgstr "Søker etter lydfiler …"
+#: ../data/toolbar.ui.h:22
+msgid "Browse artists and albums"
+msgstr "Utforsk artister og album"
-#: ../src/easytag.c:3652
-msgid "Searching"
-msgstr "Søker"
+#: ../data/toolbar.ui.h:24
+msgid "Invert file selection"
+msgstr "Inverter filutvalg"
-#: ../src/easytag.c:4318
-msgid "Select a directory to browse"
-msgstr "Velg en mappe som skal utforskes"
+#: ../data/toolbar.ui.h:26
+msgid "Search filenames and tags"
+msgstr "Søk i filnavn og tagger"
-#. Menu items
-#: ../src/easytag.c:4464
-msgid "Tag selected files with this field"
-msgstr "Tagg valgte filer med dette feltet"
+#: ../data/toolbar.ui.h:27
+msgid "CDDB Search…"
+msgstr "CDDB-søk …"
-#: ../src/easytag.c:4476 ../src/scan_dialog.c:2128
-msgid "Convert '_' and '%20' to spaces"
-msgstr "Bytt ut «_» og «%20» med mellomrom"
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2755
+msgid "CDDB Search"
+msgstr "CDDB-søk"
-#: ../src/easytag.c:4483 ../src/scan_dialog.c:2130
-msgid "Convert ' ' to '_'"
-msgstr "Bytt ut mellomrom med «_»"
+#: ../data/toolbar.ui.h:30
+msgid "Generate a playlist"
+msgstr "Lag en spilleliste"
-#: ../src/easytag.c:4494
-msgid "All uppercase"
-msgstr "Bare store bokstaver"
+#: ../data/toolbar.ui.h:32
+msgid "Stop the current action"
+msgstr "Avbryt pågående handling"
-#: ../src/easytag.c:4501
-msgid "All lowercase"
-msgstr "Bare små bokstaver"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:1
+msgid "Load on startup"
+msgstr "Last inn under oppstart"
-#: ../src/easytag.c:4508
-msgid "First letter uppercase"
-msgstr "Stor forbokstav"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:3
+msgid "Default path"
+msgstr "Standardsti"
-#: ../src/easytag.c:4515
-msgid "First letter uppercase of each word"
-msgstr "Stor forbokstav i hvert ord"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:7
+msgid "Show hidden directories while browsing"
+msgstr "Vis skjulte mapper"
-#: ../src/easytag.c:4526 ../src/prefs.c:1023 ../src/scan_dialog.c:2254
-msgid "Remove spaces"
-msgstr "Fjern mellomrom"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:11
+msgid "CDDB server hostname for automatic search"
+msgstr "Vertsnavn til CDDB-tjener for automatisk søk"
-#: ../src/easytag.c:4533
-msgid "Insert space before uppercase letter"
-msgstr "Sett inn mellomrom før stor bokstav"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:12
+msgid "The CDDB server to use for the automatic search"
+msgstr "CDDB-tjener som skal brukes ved automatisk søk"
-#: ../src/easytag.c:4540
-msgid "Remove duplicate spaces or underscores"
-msgstr "Fjern doble mellomrom eller understreker"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:13
+msgid "CDDB server port for automatic search"
+msgstr "Portnummer på CDDB-tjener for automatisk søk"
-#: ../src/easytag.c:4547
-msgid "Remove all text"
-msgstr "Fjern all tekst"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:14
+msgid "The CDDB server port to use for the automatic search"
+msgstr "Tjenerport som skal brukes på CDDB-tjener for automatisk søk"
-#: ../src/easytag.c:4566
-msgid "EasyTAG: Normal exit."
-msgstr "EasyTAG: Normal avslutning."
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:15
+msgid "CDDB server path for automatic search"
+msgstr "Filsti på CDDB-tjener ved automatisk søk"
-#: ../src/easytag.c:4618
-msgid "Do you want to save them before quitting?"
-msgstr "Vil du lagre dem før du avslutter?"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:16
+msgid "The CDDB server path to use for the automatic search"
+msgstr "Filstien som skal etterspørres på CDDB-tjener ved automatisk søk"
-#: ../src/easytag.c:4645
-msgid "Do you really want to quit?"
-msgstr "Er du sikker på at du vil avslutte?"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:17
+msgid "CDDB server hostname for manual search"
+msgstr "Vertsnavn til CDDB-tjener for manuelt"
-#: ../src/et_core.c:551
-#, c-format
-msgid "Error reading tag from ogg file (%s)"
-msgstr "Det oppstod en feil ved lesing av tagg fra ogg-fil (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:18
+msgid "The CDDB server to use for a manual search"
+msgstr "CDDB-tjener som skal brukes ved manuelt søk"
-#: ../src/et_core.c:580
-#, c-format
-msgid "Error reading tag from Opus file (%s)"
-msgstr "Det oppstod en feil ved lesing av tagg fra Opus-fil (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:19
+msgid "CDDB server port for manual search"
+msgstr "Portnummer på CDDB-tjener for manuelt søk"
-#: ../src/et_core.c:723
-#, c-format
-msgid "Automatic corrections applied for file '%s'."
-msgstr "Fila «%s» har blitt automatisk korrigert."
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:20
+msgid "The CDDB server port to use for a manual search"
+msgstr "Tjenerport som skal brukes på CDDB-tjener for manuelt søk"
-#: ../src/et_core.c:2759
-msgid "ID3 Tag"
-msgstr "ID3-tagg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:21
+msgid "CDDB server path for manual search"
+msgstr "Filsti på CDDB-tjener ved manuelt søk"
-#: ../src/et_core.c:2765
-msgid "Ogg Vorbis Tag"
-msgstr "Ogg Vorbis-tagg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:22
+msgid "The CDDB server path to use for a manual search"
+msgstr "Filstien som skal etterspørres på CDDB-tjener ved manuelt søk"
-#: ../src/et_core.c:2771
-msgid "FLAC Vorbis Tag"
-msgstr "FLAC Vorbis-tagg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:23
+msgid "Use DLM to match CDDB results to files"
+msgstr "Bruk DLM for å kontrollere CDDB-søkeresultater mot lokale filer"
-#: ../src/et_core.c:2776
-msgid "APE Tag"
-msgstr "APE-tagg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:25
+msgid ""
+"Select the file with the position which matches the position of the CDDB "
+"result"
+msgstr ""
+"Velg filen med posisjonen som samsvarer med CDDB-søkeresultatets posisjon"
-#: ../src/et_core.c:2781
-msgid "MP4/M4A/AAC Tag"
-msgstr "MP4-/M4A-/AAC-tagg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:27
+msgid "Enable proxy for remote CDDB"
+msgstr "Slå på mellomtjener for ekstern CDDB"
-#: ../src/et_core.c:2787
-msgid "Wavpack Tag"
-msgstr "Wavpack-tagg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:29
+msgid "CDDB proxy hostname"
+msgstr "Vertsnavn på CDDB-mellomtjener"
-#: ../src/et_core.c:2793
-msgid "Opus Tag"
-msgstr "Opus-tagg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:31
+msgid "CDDB proxy port"
+msgstr "Port på CDDB-mellomtjener"
-#: ../src/et_core.c:2813
-msgid "MP3 File"
-msgstr "MP3-fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:33
+msgid "CDDB proxy username"
+msgstr "Brukernavn på CDDB-mellomtjener"
-#: ../src/et_core.c:2817
-msgid "MP2 File"
-msgstr "MP2-fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:35
+msgid "CDDB proxy password"
+msgstr "Passord på CDDB-mellomtjener"
-#: ../src/et_core.c:2823
-msgid "Ogg Vorbis File"
-msgstr "Ogg Vorbis-fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:37
+msgid "Run the scanner on CDDB results"
+msgstr "Kjør skanneren på CDDB-søkeresultater"
-#: ../src/et_core.c:2829
-msgid "Speex File"
-msgstr "Speex-fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:39
+msgid "The fields to use in a manual CDDB search"
+msgstr "Felt som skal brukes ved manuelt CDDB-søk"
-#: ../src/et_core.c:2835
-msgid "FLAC File"
-msgstr "FLAC-fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:40
+msgid "Which fields to search for matches of the returned CDDB results"
+msgstr "Hvilke felt som skal sjekkes for samsvar med CDDB-søkeresultater"
-#: ../src/et_core.c:2840
-msgid "MusePack File"
-msgstr "MusePack-file"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:41
+msgid "The categories to use in a CDDB search"
+msgstr "Kategorier som skal brukes i et CDDB-søk"
-#: ../src/et_core.c:2844
-msgid "Monkey's Audio File"
-msgstr "Monkey's Audio File"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:42
+msgid "Which categories to search for matches in the returned CDDB results"
+msgstr ""
+"Hvilke mapper som skal gjennomsøkes for samsvar med CDDB-søkeresultater"
-#: ../src/et_core.c:2849
-msgid "MP4/AAC File"
-msgstr "MP4-/AAC-fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:43
+msgid "The tag fields to set when matching against CDDB results"
+msgstr "Taggfelt som skal fylles ut ved samsvar med CDDB-søkeresultater"
-#: ../src/et_core.c:2855
-msgid "Wavpack File"
-msgstr "Wavpack-fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:44
+msgid ""
+"Which tag fields should be set when matching against selected files and CDDB "
+"results"
+msgstr ""
+"Hvilke taggfelt som skal fylles ut ved samsvar med merkede filer og CDDB-"
+"søkeresultater"
-#: ../src/et_core.c:2861
-msgid "Opus File"
-msgstr "Opus-fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:51
+msgid "Show changed files in bold"
+msgstr "Gi endrede filer fet skrift"
-#: ../src/et_core.c:2920 ../src/et_core.c:2975
-msgid "File not found"
-msgstr "Fant ikke fila"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:52
+msgid ""
+"Whether to highlight changed files in the file list by making them bold, or "
+"alternatively by making them red"
+msgstr "Om endrede filer skal utheves i fillista med fet eller rød skrift"
-#: ../src/et_core.c:2925
-#, c-format
-msgid "Cannot query file information (%s)"
-msgstr "Klarte ikke å spørre etter filinformasjon (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:55
+msgid "How to sort audio files in the file list"
+msgstr "Hvordan lydfiler skal sorteres i fillista"
-#: ../src/et_core.c:2959
-msgid "Read-only file"
-msgstr "Skrivebeskyttet fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:56
+msgid "Sort files in ascending or descending order for the selected type"
+msgstr "Sorter valgt filtype i stigende eller synkende rekkefølge "
-#. And refresh the number of files in this directory
-#: ../src/et_core.c:3023
-#, c-format
-msgid "One file"
-msgid_plural "%u files"
-msgstr[0] "Én fil"
-msgstr[1] "%u filer"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:57
+msgid "Number of log lines"
+msgstr "Antall logglinjer"
-#: ../src/et_core.c:3227
-#, c-format
-msgid "Images (%d)"
-msgstr "Bilder (%d)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:61
+msgid "Use a non-standard character encoding when reading ID3 tags"
+msgstr "Bruk selvvalgt tegnkoding til å lese ID3-tagger"
-#. Bitrate
-#: ../src/et_core.c:3269 ../src/flac_header.c:205
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:142
-#: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
-#: ../src/ogg_header.c:401 ../src/opus_header.c:227 ../src/wavpack_header.c:78
-#, c-format
-msgid "%d kb/s"
-msgstr "%d kb/s"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:65
+msgid "Write ID3v1 tags"
+msgstr "Skriv ID3v1-tagger"
-#. Samplerate
-#: ../src/et_core.c:3274 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:147
-#: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
-#: ../src/ogg_header.c:406 ../src/opus_header.c:232 ../src/wavpack_header.c:83
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:67
+msgid "The character set for writing ID3v1 tags"
+msgstr "Tegnsett som skal brukes til å skrive ID3v1-tagger"
-#: ../src/et_core.c:3420 ../src/scan_dialog.c:688
-#, c-format
-msgid "Could not convert filename '%s' into system filename encoding"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:68
+msgid "Choose the character set to be used when writing ID3v1 tags"
+msgstr "Velg tegnsett som skal brukes til å skrive ID3v1-tagger"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:69
+msgid "Encoding options when writing ID3v1 tags"
+msgstr "Kodevalg ved skriving av ID3v1-tagger"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:70
+msgid ""
+"Additional options to pass to iconv() when converting between encodings when "
+"writing ID3v1 tags"
msgstr ""
-"Klarte ikke å konvertere filnavnet «%s» til systemets filnavn-tegnkoding"
+"Flere programvalg som skal sendes til iconv() ved konvertering mellom ulike "
+"tegnkodinger i ID3v1-tagger"
-#: ../src/et_core.c:3422
-msgid "Try setting the environment variable G_FILENAME_ENCODING."
-msgstr "Prøv å definere miljøvariabelen G_FILENAME_ENCODING."
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:71
+msgid "The character set for reading ID3v1 and ID3v2 tags"
+msgstr "Tegnsett som skal brukes til å lese ID3v1- og ID3v2-tagger"
-#: ../src/et_core.c:3423 ../src/scan_dialog.c:690
-msgid "Filename translation"
-msgstr "Filnavn-oversettelse"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:73
+msgid "Write ID3v2 tags"
+msgstr "Skriv ID3v2-tagger"
-#: ../src/et_core.c:4129
-#, c-format
-msgid "Error writing tag type %d to file %s (%s)"
-msgstr "Det oppstod en feil ved skriving av taggtypen %d til fila «%s» (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:75
+msgid "Enable ID3v2.4 support"
+msgstr "Slå på ID3v2.4-støtte"
-#. Mode
-#. Mode
-#. mpeg4ip library seems to always return -1
-#. Mode
-#: ../src/flac_header.c:215 ../src/mp4_header.cc:153 ../src/ogg_header.c:411
-#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
-msgid "Channels:"
-msgstr "Kanaler:"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:76
+msgid "Whether to write ID3v2.4 tags when ID3v2 support is enabled"
+msgstr "Om ID3v2.4-tagger skal brukes når ID3v2-støtte er slått på"
-#: ../src/flac_tag.c:131 ../src/flac_tag.c:850 ../src/flac_tag.c:860
-#, c-format
-msgid "Error while opening file: '%s' as FLAC (%s)."
-msgstr "Det oppstod en feil ved åpning av fila «%s» som FLAC (%s)."
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:77
+msgid "Convert old ID3 tag versions to new ones"
+msgstr "Konverter gamle ID3-tagger til nytt format"
-#: ../src/flac_tag.c:352 ../src/ogg_tag.c:304
-#, c-format
-msgid ""
-"The year value '%s' seems to be invalid in file '%s'. The information will "
-"be lost while saving tag."
-msgstr ""
-"År-verdien «%s» i fila «%s» ser ut til å være ugyldig. Denne informasjonen "
-"går tapt når du lagrer taggen."
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:81
+msgid "Use CRC-32 in ID3v2 tags"
+msgstr "Ta med CRC-32 i ID3v2-taggene"
-#: ../src/flac_tag.c:1061
-#, c-format
-msgid "Picture block isn't valid: '%s'"
-msgstr "Bildeblokka «%s» er ugyldig"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:85
+msgid "Use Unicode character encoding in ID3v2 tags"
+msgstr "Bruk Unicode-tegnkoding i ID3v2-tagger"
-#: ../src/flac_tag.c:1094
-#, c-format
-msgid "Error: Failed to write comments to file '%s' (%s)."
-msgstr "Feil: klarte ikke å skrive kommentarer til fila «%s» (%s)."
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:86
+msgid "Whether to use a Unicode character set when writing ID3v2 tags"
+msgstr "Om det skal brukes et Unicode-tegnsett til skriving av ID3v2-tagger"
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1161
-#, c-format
-msgid "Written tag of '%s'"
-msgstr "Tagg er skrevet til «%s»"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:87
+msgid "The Unicode character set for writing ID3v2 tags"
+msgstr "Unicode-tegnsett som brukes til å skrive ID3v2-tagger"
-#: ../src/id3_tag.c:205
-#, c-format
-msgid "Error while reading file: '%s' (%s)"
-msgstr "Det oppstod en feil ved lesing av fila «%s» (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:88
+msgid "Choose the Unicode character set to be used when writing ID3v2 tags"
+msgstr "Velg Unicode-tegnsett som skal brukes til å skrive ID3v2-tagger"
-#: ../src/id3_tag.c:217
-#, c-format
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:89
+msgid "The character set for writing ID3v2 tags"
+msgstr "Tegnsett som brukes til å skrive ID3v2-tagger"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:90
msgid ""
-"As the following corrupted file '%s' will cause an error in id3lib, it will "
-"not be processed"
+"Override the typical Unicode character set to be used when writing ID3v2 tags"
msgstr ""
-"Fila «%s» er korrupt, og ville ha forårsaket en feil i id3lib. Den blir "
-"derfor ikke behandlet"
+"Overstyr standard Unicode-tegnsett som brukes ved skriving av ID3v2-tagger"
-#: ../src/id3_tag.c:219
-msgid "Corrupted file"
-msgstr "Korrupt fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:91
+msgid "Encoding options when writing ID3v2 tags"
+msgstr "Valg for tegnsettkoding ved skriving av ID3v2-tagger"
-#: ../src/id3_tag.c:592
-#, c-format
-msgid "Removed tag of '%s'"
-msgstr "Fjernet tagg fra «%s»"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:92
+msgid ""
+"Additional options to pass to iconv() when converting between encodings when "
+"writing ID3v2 tags"
+msgstr ""
+"Flere programvalg som skal sendes til iconv() ved konvertering mellom ulike "
+"tegnkodinger i ID3v2-tagger"
-#: ../src/id3_tag.c:596 ../src/id3_tag.c:696
-#, c-format
-msgid "Error while removing ID3v1 tag of '%s' (%s)"
-msgstr "Det oppstod en feil ved fjerning av ID3v1-tagg fra «%s» (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:93
+msgid "Automatically complete the date"
+msgstr "Fullfør dato automatisk"
-#: ../src/id3_tag.c:598 ../src/id3_tag.c:668
-#, c-format
-msgid "Error while removing ID3v2 tag of '%s' (%s)"
-msgstr "Det oppstod en feil ved fjerning av ID3v1-tagg fra «%s» (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:95
+msgid "Pad the disc number tag field"
+msgstr "Fyll ut platenummer-felt"
-#: ../src/id3_tag.c:617
-#, c-format
-msgid "Error while updating ID3v2 tag of '%s' (%s)"
-msgstr "Det oppstod en feil ved oppdatering av ID3v2-tagg for «%s» (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:97
+msgid "The length of the disc number field"
+msgstr "Lengde på platenummer-felt"
-#: ../src/id3_tag.c:645
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:98
msgid ""
-"You have tried to save this tag to Unicode but it was detected that your "
-"version of id3lib is buggy"
+"The length of the disc number field, which controls if the field is padded "
+"with leading zeroes"
msgstr ""
-"Du har prøvd å lagre denne taggen i Unicode-format, men versjonen du bruker "
-"av id3lib inneholder feil"
+"Ønsket antall sifre i platenummer-felt. Dette styrer hvorvidt feltet "
+"utfylles med ledende nuller"
-#: ../src/id3_tag.c:647
-#, c-format
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:100
msgid ""
-"If you reload this file, some characters in the tag may not be displayed "
-"correctly. Please, apply the patch src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which is available in "
-"the EasyTAG package sources.\n"
-"Note that this message will appear only once.\n"
-"\n"
-"File: %s"
+"Whether to, when adding cover art, automatically select the type for an "
+"image based on its filename"
msgstr ""
-"Hvis du laster inn denne fila på nytt, kan det hende at enkelte tegn i "
-"taggen ikke vises korrekt. Bruk programfikset src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff på id3lib, som er tilgjengelig i "
-"EasyTAGs pakkekilder.\n"
-"Denne meldinga vises bare én gang.\n"
-"\n"
-"Fil: %s"
+"Om bildetype skal velges automatisk når cover-bilder legges til, basert på "
+"bildenes filnavn"
-#: ../src/id3_tag.c:654
-msgid "Buggy id3lib"
-msgstr "id3lib inneholder feil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:101
+msgid "Pad the track number tag field"
+msgstr "Fyll ut spornummer-felt"
-#: ../src/id3_tag.c:688
-#, c-format
-msgid "Error while updating ID3v1 tag of '%s' (%s)"
-msgstr "Det oppstod en feil ved oppdatering av ID3v1-tagg for «%s» (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:103
+msgid "The length of the track number field"
+msgstr "Lengde på spornummer-felt"
-#: ../src/id3_tag.c:702 ../src/id3v24_tag.c:1108
-#, c-format
-msgid "Updated tag of '%s'"
-msgstr "Oppdatert tag for «%s»"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:104
+msgid ""
+"The length of the track number field, which controls if the field is padded "
+"with leading zeroes"
+msgstr ""
+"Ønsket antall sifre i spornummer-felt. Dette styrer hvorvidt feltet utfylles "
+"med ledende nuller"
-#: ../src/id3_tag.c:721
-msgid "No error reported"
-msgstr "Ingen feil er rapportert"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:107
+msgid "Convert spaces and underscores when filling tag fields"
+msgstr "Konverter mellomrom og understreker ved utfylling av taggfelt"
-#: ../src/id3_tag.c:723
-msgid "No available memory"
-msgstr "Intet minne tilgjengelig"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:109
+#, no-c-format
+msgid ""
+"Whether to convert to spaces (and %20) or underscores when filling tag "
+"fields from filenames"
+msgstr ""
+"Om det skal konverteres til mellomrom (og «%20») eller understreker når "
+"filnavn brukes til å fylle ut taggfelt"
-#: ../src/id3_tag.c:725
-msgid "No data to parse"
-msgstr "Ingen data å lese"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:110
+msgid "Overwrite tag field"
+msgstr "Overskriv taggfelt"
-#: ../src/id3_tag.c:727
-msgid "Improperly formatted data"
-msgstr "Feilformaterte data"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:112
+msgid "Set the default comment"
+msgstr "Velg standardkommentar"
-#: ../src/id3_tag.c:729
-msgid "No buffer to write to"
-msgstr "Intet mellomlager å skrive til"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:114
+msgid "Default comment for filling tags"
+msgstr "Standardkommentar ved utfylling av tagger"
-#: ../src/id3_tag.c:731
-msgid "Buffer is too small"
-msgstr "Mellomlageret er for lite"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:115
+msgid "The default comment to use when filling tags"
+msgstr "Standard kommentartekst som skal brukes ved utfylling av tagger"
-#: ../src/id3_tag.c:733
-msgid "Invalid frame ID"
-msgstr "Ugyldig ramme-ID"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:116
+msgid "Use the CRC-32 as the default comment"
+msgstr "Bruk CRC-32 som standardkommentar"
-#: ../src/id3_tag.c:735
-msgid "Requested field not found"
-msgstr "Fant ikke etterspurt felt"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:130
+msgid "Run the current scanner when loading filenames from a file"
+msgstr "Kjør gjeldende skanner når filnavn hentes fra en fil"
-#: ../src/id3_tag.c:737
-msgid "Unknown field type"
-msgstr "Ukjent felttype"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:132
+msgid "Process these tag fields"
+msgstr "Behandle disse taggfeltene"
-#: ../src/id3_tag.c:739
-msgid "Tag is already attached to a file"
-msgstr "Taggen er allerede festet til en fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:133
+msgid "The tag fields to process when using the scanner"
+msgstr "Taggfeltene som skal behandles ved bruk av skanneren"
-#: ../src/id3_tag.c:741
-msgid "Invalid tag version"
-msgstr "Ugyldig taggversjon"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:134
+msgid "Convert tag fields when processing"
+msgstr "Konverter taggfelt under behandlingsprosessen"
-#: ../src/id3_tag.c:743
-msgid "No file to parse"
-msgstr "Ingen fil å lese"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:136
+#, no-c-format
+msgid ""
+"Whether to convert to spaces (and %20), underscores or other characters when "
+"processing tag fields"
+msgstr ""
+"Om det skal konverteres til mellomrom (og «%20») understreker eller andre "
+"tegn når taggfelt behandles"
-#: ../src/id3_tag.c:745
-msgid "Attempting to write to a read-only file"
-msgstr "Prøver å skrive til en skrivebeskyttet fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:137
+msgid "Convert characters in tags"
+msgstr "Konverter tegn i tagger"
-#: ../src/id3_tag.c:747
-msgid "Error in compression/uncompression"
-msgstr "Feil under komprimering/utpakking"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:138
+msgid ""
+"Whether to convert characters of the tag from one value to another when "
+"processing tag fields"
+msgstr ""
+"Om tegn i taggen skal konverteres fra en verdi til en annen ved behandling "
+"av taggfelt"
-#: ../src/id3_tag.c:749
-msgid "Unknown error message"
-msgstr "Ukjent feilmelding"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:139
+msgid "Convert the following characters when processing tag fields"
+msgstr "Konverter følgende tegn ved behandling av taggfelt"
-#: ../src/id3_tag.c:1357
-#, c-format
-msgid "Error while creating temporary file: '%s'"
-msgstr "Det oppstod en feil ved opprettelse av den midlertidige fila «%s»"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:140
+msgid ""
+"Replace any matched sequence of characters with this string when processing "
+"tag fields"
+msgstr ""
+"Erstatt samsvarende rekker av tegn med denne strengen ved behandling av "
+"taggfelt"
-#: ../src/id3_tag.c:1364
-msgid "Error while creating temporary file"
-msgstr "Det oppstod en feil ved opprettelse av midlertidig fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:141
+msgid "Lower-case all characters"
+msgstr "Gjør alle tegn små"
-#: ../src/id3_tag.c:1384
-#, c-format
-msgid "Error while writing to file: '%s' (%s)"
-msgstr "Det oppstod en feil ved skriving til fila «%s» (%s)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:143
+msgid "Upper-case all characters"
+msgstr "Gjør alle bokstaver store"
-#. Translators: The first string is a filename, the
-#. * second string is the number of bytes that were
-#. * missing (not read for some reason) while reading from
-#. * the file.
-#.
-#: ../src/id3v24_tag.c:1563
-#, c-format
-msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
-msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
-msgstr[0] "Klarte ikke å skrive tagg til fila «%s» (den mangler en byte)"
-msgstr[1] "Klarte ikke å skrive tagg til fila «%s» (den mangler %s byte)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:145
+msgid "Upper-case the first letter of the tag"
+msgstr "Gjør om første bokstav i tagg til stor bokstav"
-#: ../src/id3v24_tag.c:1584
-#, c-format
-msgid "Cannot save tag of file '%s'"
-msgstr "Klarte ikke å lagre tagg i fila «%s»"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:147
+msgid "Upper-case the first letter of each word"
+msgstr "Gjør første bokstav i hvert ord til stor bokstav"
-#: ../src/id3v24_tag.c:1595
-#, c-format
-msgid "Size error while saving tag of '%s'"
-msgstr "Det oppstod en størrelsesfeil da taggen for «%s» ble lagret"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:149
+msgid "Upper-case prepositions"
+msgstr "Gi preposisjoner store bokstaver"
-#: ../src/log.c:100
-msgid "Log"
-msgstr "Logg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:151
+msgid "Detect roman numerals"
+msgstr "Oppdag romerske numre"
-#: ../src/misc.c:720
-msgid "You must type a program name"
-msgstr "Du må skrive inn et programnavn"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:155
+msgid "Insert spaces before capital letters"
+msgstr "Sett inn mellomrom før store bokstaver"
-#: ../src/misc.c:721
-msgid "Program Name Error"
-msgstr "Feil i programnavn"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:157
+msgid "Remove duplicate spaces"
+msgstr "Fjern doble mellomrom"
-#: ../src/misc.c:800
-#, c-format
-msgid "Executed command: %s"
-msgstr "Kjørt kommando: %s"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:159
+msgid "Playlist filename mask"
+msgstr "Maske for spilleliste-filnavn"
-#: ../src/misc.c:807
-#, c-format
-msgid "Failed to launch program: %s"
-msgstr "Klarte ikke å starte programmet %s"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:160
+msgid "The default filename mask to use for a new playlist"
+msgstr "Standard maske som skal brukes for filnavn på nye spillelister"
-#: ../src/misc.c:824
-msgid "Select File"
-msgstr "Velg fil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:161
+msgid "Use a filename mask when generating a playlist"
+msgstr "Bruk en filnavn-maske når spillelister opprettes"
-#: ../src/misc.c:830
-msgid "Select Directory"
-msgstr "Velg mappe"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:162
+msgid "Whether to use a filename mask when creating playlists"
+msgstr "Om det skal brukes en maske for filnavn på nye spillelister"
-#: ../src/misc.c:1142
-msgid "Generate Playlist"
-msgstr "Lag spilleliste"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:163
+msgid "Create playlists with only the selected files"
+msgstr "Bare lag spillelister med valgte filer"
-#: ../src/misc.c:1166
-msgid "M3U Playlist Name"
-msgstr "M3U-spillelistenavn"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:165
+msgid "Use relative paths when creating playlists"
+msgstr "Bruk relative stier når spillelister lages"
-#: ../src/misc.c:1181
-msgid "Use directory name"
-msgstr "Bruk mappenavn"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:166
+msgid "Whether to use relative paths for files when creating playlists"
+msgstr "Om relative stier til filer skal brukes når spillelister lages"
-#. Playlist options
-#: ../src/misc.c:1198
-msgid "Playlist Options"
-msgstr "Spillelistevalg"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:167
+msgid "Create the playlist in the parent directory"
+msgstr "Lag ny spilleliste i foreldermappe"
-#: ../src/misc.c:1204
-msgid "Include only the selected files"
-msgstr "Bare ta med de valgte filene"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:169
+msgid "Use DOS separators for playlists"
+msgstr "Bruk DOS-skilletegn for spillelister"
-#: ../src/misc.c:1207
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:171
+msgid "Content of generated playlists"
+msgstr "Innhold i genererte spillelister"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:172
msgid ""
-"If activated, only the selected files will be written in the playlist file. "
-"Else, all the files will be written."
+"Write a plain list of files, include extended information from the filename "
+"or extended information using a supplied mask"
msgstr ""
-"Hvis dette er slått på, tas bare valgte filer med i spillelistefila. Ellers "
-"tas alle filene med."
+"Skriv en ren liste over filer, og ta med utvidet info fra filnavn eller via "
+"en angitt maske"
-#: ../src/misc.c:1210
-msgid "Use full path for files in playlist"
-msgstr "Bruk fullstendig filsti for filer i spillelista"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:173
+msgid "Playlist default mask"
+msgstr "Standard spilleliste-maske"
-#: ../src/misc.c:1213
-msgid "Use relative path for files in playlist"
-msgstr "Bruk relativ filsti for filer i spillelista"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:174
+msgid "The default mask to use for files in a playlist"
+msgstr "Standardmaske som skal brukes på filer i en spilleliste"
-#. Create playlist in parent directory
-#: ../src/misc.c:1219
-msgid "Create playlist in the parent directory"
-msgstr "Lag ny spilleliste i foreldermappa"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:175
+msgid "Search for files case-sensitively"
+msgstr "Skill mellom små og store bokstaver ved søk etter filer"
-#: ../src/misc.c:1222
-msgid "If activated, the playlist will be created in the parent directory."
-msgstr "Hvis dette er slått på, lagres spillelister i foreldermapper."
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:176
+msgid "Whether matches when searching for files are case-sensitive"
+msgstr ""
+"Om søkeresultater ved søk etter filer skiller mellom små og store bokstaver"
-#. DOS Separator
-#: ../src/misc.c:1226
-msgid "Use DOS directory separator"
-msgstr "Bruk DOS-vennlig mappeskilletegn"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:177
+msgid "Search in filenames"
+msgstr "Søk blant filnavn"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:178
+msgid "Perform the search on filenames"
+msgstr "Utfør søk blant filnavn"
-#: ../src/misc.c:1232
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:179
+msgid "Search in tags"
+msgstr "Søk i tagger"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:180
+msgid "Perform the search on tags"
+msgstr "Utfør søk i tagger"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:181
+msgid "Mask for filling tags from filenames"
+msgstr "Maske for utfylling av tagg basert på filnavn"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:182
msgid ""
-"This option replaces the UNIX directory separator '/' into DOS separator "
-"'\\'."
+"The default mask to use when automatically filling tags with information "
+"from filenames"
msgstr ""
-"Dette valget erstatter UNIX-mappeskilletegnet «/» med DOS-skilletegnet «\\»."
+"Standard maske som skal brukes når tagger fylles ut automatisk med "
+"informasjon fra filnavn"
-#: ../src/misc.c:1241
-msgid "Playlist Content"
-msgstr "Spilleliste-innhold"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:183
+msgid "Mask for renaming files"
+msgstr "Maske for endring av filnavn"
-#: ../src/misc.c:1247
-msgid "Write only list of files"
-msgstr "Bare skriv en liste over filer"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:184
+msgid "The default mask to use when renaming files"
+msgstr "Standardmaske som skal brukes når filer får nye navn"
-#: ../src/misc.c:1251
-msgid "Write info using filename"
-msgstr "Skriv info ved bruk av filnavn"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:185
+msgid "Mask for renaming directories"
+msgstr "Maske for endring av mappenavn"
-#: ../src/misc.c:1254
-msgid "Write info using:"
-msgstr "Skriv info ved bruk av:"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:186
+msgid "The default mask to use when renaming directories"
+msgstr "Standard maske som skal brukes når mapper får nye navn"
-#: ../src/misc.c:1468
-#, c-format
-msgid "Cannot write playlist file '%s'"
-msgstr "Klarte ikke å skrive spilleliste-fila «%s»"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:187
+msgid "Use a mask when renaming directories"
+msgstr "Bruk en maske når mapper får nye navn"
-#: ../src/misc.c:1472
-msgid "Playlist File Error"
-msgstr "Feil med spillelistefil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:189
+msgid "Convert spaces and underscores when renaming files"
+msgstr "Konverter mellomrom og understrek når filer får nye navn"
-#: ../src/misc.c:1480
-#, c-format
-msgid "Written playlist file '%s'"
-msgstr "Spilleliste-fila «%s» er skrevet"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:190
+msgid "Whether to convert to spaces or underscores when renaming files"
+msgstr ""
+"Om det skal konverteres til mellomrom eller understreker når filer får nye "
+"navn"
-#: ../src/misc.c:1544 ../src/scan_dialog.c:2747 ../src/scan_dialog.c:2809
-msgid "Invalid scanner mask"
-msgstr "Ugyldig skannermaske"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:191
+msgid "How to modify filename extensions when renaming"
+msgstr "Hvordan filetternavn skal endres ved endring av navn"
-#: ../src/misc.c:1908
-msgid "CD"
-msgstr "CD"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:192
+msgid ""
+"Change the file extension to all lower-case, all upper-case or do not change "
+"it"
+msgstr "Endre bokstaver i filetternavn til små, store eller la dem være"
-#: ../src/misc.c:1930
-msgid "Find Files"
-msgstr "Finn filer"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:193
+msgid "Encoding options when renaming files"
+msgstr "Kodevalg ved endring av filnavn"
-#: ../src/misc.c:1962
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:194
msgid ""
-"Type the word to search into files. Or type nothing to display all files."
+"If the encoding of the filename does not match the filesystem encoding, "
+"choose whether to try another encoding, approximate the filesystem encoding "
+"with transliteration or discard the offending characters"
msgstr ""
-"Skriv ordet du vil søke etter, eller la feltet stå tomt for å vise alle "
-"filer."
+"Velg om programmet skal prøve en annen koding, oversette til antatt "
+"filsystem-koding eller om ustøttede tegn skal fjernes hvis koding i filnavn "
+"ikke samsvarer med filsystemets koding"
-#. Where...
-#: ../src/misc.c:1968
-msgid "In:"
-msgstr "I:"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:196
+msgid ""
+"Whether to replace illegal characters in a filename when using the rename "
+"function"
+msgstr ""
+"Om ugyldige tegn i filnavn skal erstattes med gyldige tegn når "
+"funksjonalitet for navneendring brukes"
-#. Translators: This option is for the previous 'in' option. For instance,
-#. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1973
-msgid "the Filename"
-msgstr "filnavnet"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:197
+msgid "Show the scanner mask editor"
+msgstr "Vis maskebehandler"
-#. Translators: This option is for the previous 'in' option. For instance,
-#. * translate this as "Search" "In:" "the Tag".
-#. * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
-#. * grammatical problem (which uses one word to say "in the tag" like here)
-#.
-#: ../src/misc.c:1979
-msgid "the Tag"
-msgstr "taggen"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:198
+msgid "Whether to show the scanner mask editor in the tag scanner"
+msgstr "Om tagg-skannerens maskebehandler skal vises"
-#. Property of the search
-#: ../src/misc.c:1990 ../src/prefs.c:335
-msgid "Case sensitive"
-msgstr "Skill mellom små og store bokstaver"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:199
+msgid "Show the scanner legend"
+msgstr "Vis skannerforklaring"
-#: ../src/misc.c:2217
-msgid "Ready to search…"
-msgstr "Klar til å søke …"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:200
+msgid "Whether to show the scanner legend in the tag scanner"
+msgstr "Om forklaringstekst skal vises i taggskanneren"
-#: ../src/misc.c:2437
-#, c-format
-msgid "Found one file"
-msgid_plural "Found %d files"
-msgstr[0] "Fant én fil"
-msgstr[1] "Fant %d filer"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:201
+msgid "Show the scanner window on startup"
+msgstr "Vis skannervindu ved oppstart"
-#: ../src/misc.c:2722
-msgid "Load Filenames From a Text File"
-msgstr "Last inn filnavn fra en tekstfil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:203
+msgid "The scan mode"
+msgstr "Skannemodus"
-#: ../src/misc.c:2751
-msgid "File:"
-msgstr "Fil:"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:204
+msgid "Which type of scan to show in the scanner"
+msgstr "Hvilken type skanning som skal vises i skanneren"
-#. Button 'load'
-#. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2770
-msgid " Load "
-msgstr "Last inn"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:205
+msgid "Split Ogg title fields"
+msgstr "Del opp Ogg-tittelfelt"
-#: ../src/misc.c:2788
-msgid "Content of Text File"
-msgstr "Innhold i tekstfil"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:207
+msgid "Split Ogg artist fields"
+msgstr "Del opp Ogg-artistfelt"
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2809 ../src/misc.c:2904
-msgid "Insert a blank line before the selected line"
-msgstr "Sett inn en tom linje før valgt linje"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:209
+msgid "Split Ogg album fields"
+msgstr "Del opp Ogg-albumfelt"
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2818 ../src/misc.c:2913
-msgid "Delete the selected line"
-msgstr "Slett valgt linje"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:211
+msgid "Split Ogg genre fields"
+msgstr "Del opp Ogg-sjangerfelt"
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3403
-msgid "Delete all blank lines"
-msgstr "Slett alle tomme linjer"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:213
+msgid "Split Ogg comment fields"
+msgstr "Del opp Ogg-kommentarfelt"
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2839 ../src/misc.c:2934
-msgid "Move up the selected line"
-msgstr "Flytt valgt linje opp"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:215
+msgid "Split Ogg composer fields"
+msgstr "Del opp Ogg-komponistfelt"
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2848 ../src/misc.c:2943
-msgid "Move down the selected line"
-msgstr "Flytt valgt linje ned"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:217
+msgid "Split Ogg original artist fields"
+msgstr "Del opp Ogg-felt for opprinnelig artist"
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3427
-msgid "Reload"
-msgstr "Last inn på nytt"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:219
+msgid "Page to show in the preferences dialog"
+msgstr "Side som skal vises i oppsettsdialog"
-#: ../src/misc.c:2882
-msgid "List of Files"
-msgstr "Liste over filer"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:220
+msgid "The page in the notebook of the preferences dialog"
+msgstr "Hvilken side i oppsettsdialogens notisbok som skal vises"
-#: ../src/misc.c:2977
-msgid "Selected line:"
-msgstr "Valgt linje:"
+#: ../nautilus-extension/nautilus-easytag.c:229
+msgid "Open in EasyTAG"
+msgstr "Åpne i EasyTAG"
-#: ../src/misc.c:2995
-msgid ""
-"When activating this option, after loading the filenames, the current "
-"selected scanner will be ran (the scanner window must be opened)."
-msgstr ""
-"Når du slår på dette valget, kjøres valgt skanner (skannervinduet må være "
-"åpent) etter at filnavnene er lastet inn."
+#: ../nautilus-extension/nautilus-easytag.c:230
+msgid "Open the selected directory in EasyTAG"
+msgstr "Åpne valgt mappe i EasyTAG"
-#: ../src/misc.c:3082
-#, c-format
-msgid "Cannot retrieve file info (%s)"
-msgstr "Klarte ikke å hente filinfo (%s)"
-
-#: ../src/misc.c:3145
-#, c-format
-msgid "Can't open file '%s' (%s)"
-msgstr "Klarte ikke å åpne fila «%s» (%s)."
+#: ../nautilus-extension/nautilus-easytag.c:248
+msgid "Open the selected files in EasyTAG"
+msgstr "Åpne valgte filer i EasyTAG"
-#: ../src/misc.c:3174
-#, c-format
-msgid "Error reading file (%s)"
-msgstr "Det oppstod en feil ved lesing av fil (%s)"
-
-#: ../src/misc.c:3391
-msgid "Insert a blank line"
-msgstr "Sett inn en tom linje"
-
-#: ../src/misc.c:3397
-msgid "Delete this line"
-msgstr "Slett denne linja"
-
-#: ../src/misc.c:3412
-msgid "Move up this line"
-msgstr "Flytt denne linja opp"
-
-#: ../src/misc.c:3418
-msgid "Move down this line"
-msgstr "Flytt denne linja ned"
+#. Translators: put your own name here to appear in the about dialog.
+#: ../src/about.c:89
+msgid "translator-credits"
+msgstr "Åka Sikrom"
-#. Mode changed to profile name
-#: ../src/monkeyaudio_header.c:78 ../src/musepack_header.c:80
-#, c-format
-msgid "Profile:"
-msgstr "Profil:"
+#: ../src/about.c:99
+msgid "View and edit tags in audio files"
+msgstr "Vis og rediger tagger i lydfiler"
-#: ../src/mp4_header.cc:60 ../src/mp4_tag.cc:91 ../src/mp4_tag.cc:284
-msgid "MP4 format invalid"
-msgstr "Ugyldig MP4-format"
+#: ../src/application.c:47
+msgid "Print the version and exit"
+msgstr "Skriv ut versjonsnummer og avslutt"
-#: ../src/mp4_header.cc:68
+#. Starting messages
+#: ../src/application.c:177
#, c-format
-msgid "File contains no audio track: '%s'"
-msgstr "Fila «%s» inneholder ikke avspillbar lyd"
+msgid "Starting EasyTAG version %s…"
+msgstr "Starter EasyTAG versjon %s …"
-#: ../src/mp4_header.cc:79
+#: ../src/application.c:182
#, c-format
-msgid "Error reading properties from file: '%s'"
-msgstr "Det oppstod en feil ved lesing av egenskaper for fila «%s»"
+msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
+msgstr "Variabelen «EASYTAGLANG» er definert. Velger «%s» som region"
-#: ../src/mp4_header.cc:140 ../src/mpeg_header.c:204
+#: ../src/application.c:187
#, c-format
-msgid "~%d kb/s"
-msgstr "~%d kb/s"
+msgid "Setting locale: ‘%s’"
+msgstr "Velger region «%s»"
-#: ../src/mp4_tag.cc:101 ../src/mp4_tag.cc:293
+#: ../src/application.c:193
#, c-format
-msgid "Error reading tags from file: '%s'"
-msgstr "Det oppstod en feil ved lesing av tagger fra fila «%s»"
-
-#: ../src/mpeg_header.c:64
-msgid "Stereo"
-msgstr "Stereo"
+msgid "System locale is ‘%s’, using ‘%s’"
+msgstr "Gjeldende region er «%s». Bruker «%s»"
-#: ../src/mpeg_header.c:65
-msgid "Joint stereo"
-msgstr "Kombinert stereo"
-
-#: ../src/mpeg_header.c:66
-msgid "Dual channel"
-msgstr "Dobbeltkanal"
-
-#: ../src/mpeg_header.c:67
-msgid "Single channel"
-msgstr "Én kanal"
-
-#. MPEG, Layer versions
-#: ../src/mpeg_header.c:194
-msgid "MPEG"
-msgstr "MPEG"
+#: ../src/application.c:198
+msgid "Unable to create setting directories"
+msgstr "Klarte ikke å opprette oppsettsmapper"
-#. FIXME: Pass error back to calling function.
-#: ../src/ogg_header.c:227
+#: ../src/application.c:339
#, c-format
-msgid "Error while opening file: '%s' (%s)"
-msgstr "Det oppstod en feil ved åpning av fila «%s» (%s)"
+msgid "Website: %s"
+msgstr "Nettside: %s"
+
+#: ../src/application.c:348
+msgid "- Tag and rename audio files"
+msgstr "- Gi tagger og nytt navn til lydfiler"
-#: ../src/ogg_header.c:243
+#: ../src/application.c:432 ../src/file_list.c:400
#, c-format
-msgid ""
-"Ogg Vorbis: The specified bitstream does not exist or the file has been "
-"initialized improperly (file: '%s')."
+msgid "Error while querying information for file ‘%s’: %s"
msgstr ""
-"Ogg Vorbis: Valgt bitstrøm finnes ikke, eller fila har blitt lastet inn på "
-"feil måte (fil: «%s»)."
+"Det oppstod en feil under etterspørsel av informasjon om filen «%s». %s"
-#: ../src/ogg_header.c:279
+#: ../src/application.c:495 ../src/application.c:503
#, c-format
-msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
-msgstr "Ogg Vorbis: Det oppstod en feil ved lesing fra mediet (fil: «%s»)."
+msgid "Cannot open path ‘%s’"
+msgstr "Klarte ikke å åpne stien «%s»"
-#: ../src/ogg_header.c:282
+#: ../src/application_window.c:318 ../src/application_window.c:335
#, c-format
-msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
-msgstr "Ogg Vorbis: Bitstrømmen inneholder ikke Vorbis-data (fil: «%s»)."
+msgid "Do you really want to delete the file ‘%s’?"
+msgstr "Er du sikker på at du vil slette filen «%s»?"
-#: ../src/ogg_header.c:285
-#, c-format
-msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr "Ogg Vorbis: Vorbis-versjonene samsvarer ikke (fil: «%s»)."
+#: ../src/application_window.c:321 ../src/easytag.c:470 ../src/easytag.c:603
+msgid "Repeat action for the remaining files"
+msgstr "Gjenta handling for filene som gjenstår"
-#: ../src/ogg_header.c:288
-#, c-format
-msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
-msgstr "Ogg Vorbis: Ugyldig Vorbis-bitstrøm-hode (fil: «%s»)."
+#: ../src/application_window.c:323
+msgid "_Skip"
+msgstr "_Hopp over"
-#: ../src/ogg_header.c:291
-#, c-format
-msgid ""
-"Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
-"(file: '%s')."
-msgstr ""
-"Ogg Vorbis: Intern logisk feil. Dette tyder ofte på en programfeil eller "
-"ødelagt haug/stabel (fil: «%s»)."
+#: ../src/application_window.c:325 ../src/application_window.c:339
+msgid "_Delete"
+msgstr "_Slett"
-#: ../src/ogg_header.c:337
-#, c-format
-msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
-msgstr "Feil: klarte ikke å åpne fila «%s» som Vorbis (%s)."
+#: ../src/application_window.c:327 ../src/application_window.c:337
+msgid "Delete File"
+msgstr "Slett fil"
-#: ../src/ogg_tag.c:706 ../src/ogg_tag.c:881
+#: ../src/application_window.c:364
#, c-format
-msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
-msgstr "Advarsel: Ogg Vorbis-fila «%s» inneholder en ID3v2-tagg."
+msgid "File ‘%s’ deleted"
+msgstr "filen «%s» er slettet"
-#: ../src/ogg_tag.c:1030 ../src/picture.c:1082
+#: ../src/application_window.c:541
#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Det oppstod en feil med «loader_write». %s"
+msgid "Cannot delete file ‘%s’"
+msgstr "Klarte ikke å slette filen «%s»"
-#: ../src/ogg_tag.c:1045 ../src/picture.c:1005
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Det oppstod en feil med «loader_close». %s"
+#: ../src/application_window.c:565
+msgid "Some files were not deleted"
+msgstr "Enkelte filer ble ikke slettet"
-#: ../src/picture.c:244 ../src/picture.c:269
-#, c-format
-msgid "Image file not loaded: %s"
-msgstr "Bildefila ble ikke lastet inn. %s"
+#: ../src/application_window.c:567
+msgid "All files have been deleted"
+msgstr "Alle filer er slettet"
+
+#: ../src/application_window.c:901
+msgid "All tags have been removed"
+msgstr "Alle tagger er fjernet"
-#: ../src/picture.c:261
+#: ../src/application_window.c:1505 ../src/browser.c:356 ../src/browser.c:399
+#: ../src/browser.c:433 ../src/browser.c:4732 ../src/browser.c:4807
#, c-format
-msgid "Cannot open file: '%s'"
-msgstr "Klarte ikke å åpne fila: «%s»"
+msgid "Failed to launch program ‘%s’"
+msgstr "Klarte ikke å starte programmet «%s»"
-#: ../src/picture.c:265
-msgid "Image File Error"
-msgstr "Feil med bildefil"
+#. Quit EasyTAG.
+#: ../src/application_window.c:2636
+msgid "Normal exit"
+msgstr "Normal avslutning"
-#: ../src/picture.c:276
-msgid "Image file loaded"
-msgstr "Bildefil er lastet inn"
+#: ../src/application_window.c:2673 ../src/browser.c:865
+msgid "Some files have been modified but not saved"
+msgstr "Noen filer er markert for endringer, men endringene er ikke lagret"
-#: ../src/picture.c:334
-msgid "Add Images"
-msgstr "Legg til bilder"
+#: ../src/application_window.c:2674 ../src/browser.c:869 ../src/easytag.c:255
+#: ../src/easytag.c:474 ../src/easytag.c:606 ../src/easytag.c:614
+msgid "_Discard"
+msgstr "_Forkast"
-#: ../src/picture.c:344 ../src/picture.c:701
-msgid "All Files"
-msgstr "Alle filer"
+#: ../src/application_window.c:2676 ../src/browser.c:871 ../src/easytag.c:256
+#: ../src/easytag.c:476 ../src/easytag.c:483 ../src/easytag.c:608
+#: ../src/easytag.c:615 ../src/playlist_dialog.c:669 ../src/tag_area.c:1840
+msgid "_Save"
+msgstr "_Lagre"
-#: ../src/picture.c:350 ../src/picture.c:707
-msgid "PNG and JPEG"
-msgstr "PNG og JPEG"
+#: ../src/application_window.c:2680 ../src/application_window.c:2718
+#: ../src/easytag.c:261
+msgid "Quit"
+msgstr "Avslutt"
-#: ../src/picture.c:477
-#, c-format
-msgid "Image Properties %d/%d"
-msgstr "Bildeegenskaper %d/%d"
+#: ../src/application_window.c:2683
+msgid "Do you want to save them before quitting?"
+msgstr "Vil du lagre dem før du avslutter?"
-#: ../src/picture.c:503
-msgid "Image Type"
-msgstr "Bildetype"
+#: ../src/application_window.c:2712
+msgid "Do you really want to quit?"
+msgstr "Er du sikker på at du vil avslutte?"
-#. Description of the picture
-#: ../src/picture.c:561
-msgid "Image Description:"
-msgstr "Bildebeskrivelse:"
+#: ../src/browser.c:569
+msgid "New default directory selected for browser"
+msgstr "Ny standardmappe for filutforsker er valgt"
-#: ../src/picture.c:688
-#, c-format
-msgid "Save Image %d/%d"
-msgstr "Lagre bilde %d/%d"
+#: ../src/browser.c:868
+msgid "Do you want to save them before changing directory?"
+msgstr "VIl du lagre dem før du bytter mappe?"
-#: ../src/picture.c:763
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Bildefila ble ikke lagret. %s"
+#: ../src/browser.c:875
+msgid "Confirm Directory Change"
+msgstr "Bekreft hopp til annen mappe"
-#: ../src/picture.c:846
-msgid "JPEG image"
-msgstr "JPEG-bilde"
+#: ../src/browser.c:2572
+msgid "All albums"
+msgstr "Alle album"
-#: ../src/picture.c:848
-msgid "PNG image"
-msgstr "PNG-bilde"
+#: ../src/browser.c:3830
+msgid "Select File"
+msgstr "Velg fil"
-#: ../src/picture.c:850
-msgid "GIF image"
-msgstr "GIF-bilde"
+#: ../src/browser.c:3837
+msgid "Select Directory"
+msgstr "Velg mappe"
-#: ../src/picture.c:852
-msgid "Unknown image"
-msgstr "Ukjent bilde"
+#: ../src/browser.c:4220
+#, c-format
+msgid "Rename the directory ‘%s’ to:"
+msgstr "Endre navn på mappen «%s» til:"
-#: ../src/picture.c:864
-msgid "32x32 pixel PNG file icon"
-msgstr "PNG-filikon av 32x32 piksler"
+#: ../src/browser.c:4360
+msgid "You must type a directory name"
+msgstr "Du må skrive inn et mappenavn"
-#: ../src/picture.c:866
-msgid "Other file icon"
-msgstr "Annet filikon"
+#: ../src/browser.c:4361 ../src/browser.c:4383
+msgid "Directory Name Error"
+msgstr "Feil i mappenavn"
-#: ../src/picture.c:868
-msgid "Cover (front)"
-msgstr "Omslag (framside)"
+#: ../src/browser.c:4379
+#, c-format
+msgid "Could not convert ‘%s’ into filename encoding"
+msgstr "Klarte ikke å konvertere «%s» til filnavn-koding"
-#: ../src/picture.c:870
-msgid "Cover (back)"
-msgstr "Omslag (bakside)"
+#: ../src/browser.c:4382
+msgid "Please use another name."
+msgstr "Bruk et annet navn."
-#: ../src/picture.c:872
-msgid "Leaflet page"
-msgstr "Leaflet-side"
+#: ../src/browser.c:4454
+#, c-format
+msgid "The directory name ‘%s’ already exists."
+msgstr "Mappenavnet «%s» finnes allerede."
-#: ../src/picture.c:874
-msgid "Media (e.g. label side of CD)"
-msgstr "Medium (f.eks. etikettsiden av en CD)"
+#: ../src/browser.c:4455 ../src/easytag.c:661
+msgid "Rename File Error"
+msgstr "Feil ved navneendring av fil"
-#: ../src/picture.c:876
-msgid "Lead artist/lead performer/soloist"
-msgstr "Hovedartist/hovedutøver/solist"
+#: ../src/browser.c:4493 ../src/browser.c:4522
+msgid "Rename Directory Error"
+msgstr "Feil ved navneendring av mappe"
-#: ../src/picture.c:878
-msgid "Artist/performer"
-msgstr "Artist/utøver"
+#: ../src/browser.c:4562
+msgid "Directory renamed"
+msgstr "Mappe har fått nytt navn"
-#: ../src/picture.c:880
-msgid "Conductor"
-msgstr "Dirigent"
+#: ../src/browser.c:4724 ../src/browser.c:4799
+#, c-format
+msgid "Executed command ‘%s’"
+msgstr "Kjørt kommando «%s»"
-#: ../src/picture.c:882
-msgid "Band/Orchestra"
-msgstr "Band/Orkester"
+#: ../src/cddb_dialog.c:270
+#, c-format
+msgid ""
+"Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: "
+"‘%s’"
+msgstr ""
+"Album: «%s», artist: «%s», varighet: «%s», år: «%s», sjanger: «%s», ID: «%s»"
-#: ../src/picture.c:886
-msgid "Lyricist/text writer"
-msgstr "Lyriker/tekstforfatter"
+#: ../src/cddb_dialog.c:586
+#, c-format
+msgid "Resolving host '%s'…"
+msgstr "Slår opp vertsnavnet «%s» …"
-#: ../src/picture.c:888
-msgid "Recording location"
-msgstr "Opptakssted"
+#: ../src/cddb_dialog.c:628
+#, c-format
+msgid "Cannot create a new socket ‘%s’"
+msgstr "Klarte ikke å lage sokkel «%s»"
-#: ../src/picture.c:890
-msgid "During recording"
-msgstr "Under opptak"
+#: ../src/cddb_dialog.c:642
+msgid "Cannot set options on the newly-created socket"
+msgstr "Klarte ikke å foreta valg på sokkelen som nettopp ble satt opp"
-#: ../src/picture.c:892
-msgid "During performance"
-msgstr "Under fremføring"
+#. Open connection to the server.
+#: ../src/cddb_dialog.c:646
+#, c-format
+msgid "Connecting to host ‘%s’, port ‘%d’…"
+msgstr "Kobler til vert «%s», port %d …"
-#: ../src/picture.c:894
-msgid "Movie/video screen capture"
-msgstr "Film/video med skjermopptak"
+#: ../src/cddb_dialog.c:659
+#, c-format
+msgid "Cannot connect to host ‘%s’: %s"
+msgstr "Klarte ikke å koble til vert «%s». %s"
-#: ../src/picture.c:896
-msgid "A bright colored fish"
-msgstr "En lysfarget fisk"
+#: ../src/cddb_dialog.c:683
+#, c-format
+msgid "Cannot resolve host ‘%s’: %s"
+msgstr "Klarte ikke å slå opp vertsnavn «%s». %s"
-#: ../src/picture.c:898
-msgid "Illustration"
-msgstr "Illustrasjon"
+#: ../src/cddb_dialog.c:696
+#, c-format
+msgid "Connected to host ‘%s’"
+msgstr "Koblet til vert «%s»"
-#: ../src/picture.c:900
-msgid "Band/Artist logotype"
-msgstr "Band-/artist-logotype"
+#: ../src/cddb_dialog.c:783
+#, c-format
+msgid "Error while writing CDDB results to file ‘%s’"
+msgstr "Det oppstod en feil under lagring av resultater fra CDDB i filen «%s»"
-#: ../src/picture.c:902
-msgid "Publisher/studio logotype"
-msgstr "Utgiver/studio-logotype"
+#: ../src/cddb_dialog.c:794
+#, c-format
+msgid "Receiving data (%s)…"
+msgstr "Mottar data (%s) …"
-#: ../src/picture.c:906
-msgid "Unknown image type"
-msgstr "Ukjent bildetype"
+#: ../src/cddb_dialog.c:807
+#, c-format
+msgid "Error when reading CDDB response ‘%s’"
+msgstr "Det oppstod en feil under lesing av CDDB-respons «%s»"
-#: ../src/picture.c:936 ../src/picture.c:947
-msgid "pixels"
-msgstr "piksler"
+#: ../src/cddb_dialog.c:814
+#, c-format
+msgid "Cannot create file ‘%s’: %s"
+msgstr "Klarte ikke å opprette filen «%s». %s"
-#: ../src/picture.c:937 ../src/picture.c:948
-msgid "Type"
-msgstr "Type"
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#: ../src/cddb_dialog.c:947 ../src/cddb_dialog.c:1590
+#: ../src/cddb_dialog.c:1934
+msgid "Sending request…"
+msgstr "Sender forespørsel …"
-#: ../src/picture.c:949
-msgid "Description"
-msgstr "Synkende, etter beskrivelse"
+#: ../src/cddb_dialog.c:951 ../src/cddb_dialog.c:1594
+#: ../src/cddb_dialog.c:1938 ../src/cddb_dialog.c:3505
+#, c-format
+msgid "Cannot send the request ‘%s’"
+msgstr "Klarte ikke å sende forespørsel «%s»"
-#: ../src/picture.c:1065
-msgid ""
-"Cannot display the image because not enough data has been read to determine "
-"how to create the image buffer."
-msgstr ""
-"Klarte ikke å vise bildet, fordi programmet må lese ytterligere data for å "
-"vite hvordan bilde-mellomlageret skal opprettes."
+#. Read the answer
+#.
+#. * Read the answer
+#.
+#: ../src/cddb_dialog.c:963 ../src/cddb_dialog.c:1621
+#: ../src/cddb_dialog.c:3523
+msgid "Receiving data…"
+msgstr "Mottar data …"
-#: ../src/picture.c:1072
-msgid "Cannot display the image"
-msgstr "Klarte ikke å vise bildet"
+#: ../src/cddb_dialog.c:970 ../src/cddb_dialog.c:1628
+#: ../src/cddb_dialog.c:1969 ../src/cddb_dialog.c:3530
+msgid "The server returned a bad response"
+msgstr "Tjeneren sendte en negativ responskode"
-#: ../src/picture.c:1074
-msgid ""
-"Not enough data has been read to determine how to create the image buffer."
-msgstr ""
-"Det har ikke blitt lest nok data til å kunne avgjøre hvordan bilde-"
-"mellomlageret skal opprettes."
+#: ../src/cddb_dialog.c:986 ../src/cddb_dialog.c:1001
+#: ../src/cddb_dialog.c:1022 ../src/cddb_dialog.c:1641
+#: ../src/cddb_dialog.c:1985 ../src/cddb_dialog.c:3547
+#, c-format
+msgid "The server returned a bad response ‘%s’"
+msgstr "Tjeneren sendte en negativ responskode «%s»"
-#: ../src/picture.c:1076
-msgid "Load Image File"
-msgstr "Last inn bildefil"
+#. Load the track list of the album
+#: ../src/cddb_dialog.c:1234
+msgid "Loading album track list…"
+msgstr "Laster inn albumets sporliste …"
-#. Label
-#: ../src/prefs.c:152
-msgid "Default directory:"
-msgstr "Standardmappe:"
+#: ../src/cddb_dialog.c:1788
+#, c-format
+msgid "Sorry, the web-based search is currently not available"
+msgstr "Nettbasert søk er ikke tilgjengelig for øyeblikket"
-#: ../src/prefs.c:165
-msgid ""
-"Specify the directory where your files are located. This path will be loaded "
-"when EasyTAG starts without parameter."
-msgstr ""
-"Oppgi mappa hvor filene dine ligger. Denne stien blir lastet inn når EasyTAG "
-"startes uten parametre."
+#: ../src/cddb_dialog.c:1791 ../src/cddb_dialog.c:2156
+#, c-format
+msgid "Found one matching album"
+msgid_plural "Found %u matching albums"
+msgstr[0] "Fant ett album som samsvarer"
+msgstr[1] "Fant %u album som samsvarer"
-#. Load directory on startup
-#: ../src/prefs.c:186
-msgid ""
-"Load on startup the default directory or the directory passed as argument"
-msgstr ""
-"Last inn standardmappa ved oppstart, eller mappa som brukes som argument"
+#: ../src/cddb_dialog.c:1957
+#, c-format
+msgid "Receiving data of page %d (album %d/%d)…"
+msgstr "Mottar data om side %d (album %d/%d) …"
-#: ../src/prefs.c:189
-msgid ""
-"Automatically search files, when EasyTAG starts, into the default directory. "
-"Note that this path may be overridden by the parameter passed to easytag "
-"(easytag /path_to/mp3_files)."
-msgstr ""
-"Søk etter filer automatisk i standardmappa når EasyTAG starter opp. Du kan "
-"overstyre dette ved å starte easytag med en annen filsti som parameter (f."
-"eks. «easytag /sti_til/mp3-filer»)."
+#: ../src/cddb_dialog.c:1959
+#, c-format
+msgid "Receiving data of page %d…"
+msgstr "Mottar data om side %d …"
-#. Browse subdirectories
-#: ../src/prefs.c:194
-msgid "Search subdirectories"
-msgstr "Søk i undermapper"
+#: ../src/cddb_dialog.c:2123
+#, c-format
+msgid "More results to load…"
+msgstr "Flere resultater å laste inn …"
-#: ../src/prefs.c:197
-msgid "Search subdirectories for files when reading a directory into the tree."
-msgstr "Se etter filer i undermapper når en mappe leses inn i trevisninga."
+#: ../src/cddb_dialog.c:2303
+msgid "The number of CDDB results does not match the number of selected files"
+msgstr "Antallet i CDDB-resultatene samsvarer ikke med antall valgte filer"
-#. Open the node to show subdirectories
-#: ../src/prefs.c:201
-msgid "Show subdirectories when selecting a directory"
-msgstr "Vis undermapper når en mappe velges"
+#: ../src/cddb_dialog.c:2309
+msgid "Write Tag from CDDB"
+msgstr "Skriv tagg fra CDDB"
-#: ../src/prefs.c:205
-msgid ""
-"This expands the selected node into the file browser to display the sub-"
-"directories."
-msgstr "Dette utvider valgt element i filutforskeren og viser undermappene."
+#: ../src/cddb_dialog.c:3015
+msgid "Ready to search"
+msgstr "Klar til å søke"
-#. Browse hidden directories
-#: ../src/prefs.c:209
-msgid "Search hidden directories"
-msgstr "Søk gjennom skjulte mapper"
+#: ../src/cddb_dialog.c:3106 ../src/load_files_dialog.c:263
+#: ../src/setting.c:327
+#, c-format
+msgid "Cannot open file ‘%s’: %s"
+msgstr "Klarte ikke å åpne «%s». %s"
-#: ../src/prefs.c:214
-msgid "Search hidden directories for files (directories starting by a '.')."
-msgstr "Se etter filer i skjulte mapper (mappenavn som begynner på «.»)."
+#: ../src/cddb_dialog.c:3333
+#, c-format
+msgid "No file selected"
+msgstr "Ingen fil er valgt"
-#.
-#. * Misc
-#.
-#: ../src/prefs.c:222
-msgid "Misc"
-msgstr "Div"
+#. The CD redbook standard defines the maximum number of tracks as 99, any
+#. queries with more than 99 tracks will never return a result.
+#: ../src/cddb_dialog.c:3341
+#, c-format
+msgid "More than 99 files selected. Cannot send request"
+msgstr "Du har valgt flere enn 99 filer. Forespørselen kan ikke sendes"
-#. User interface
-#: ../src/prefs.c:228
-msgid "User Interface"
-msgstr "Brukergrensesnitt"
+#: ../src/cddb_dialog.c:3347
+#, c-format
+msgid "One file selected"
+msgid_plural "%u files selected"
+msgstr[0] "Én fil valgt"
+msgstr[1] "%u filer valgt"
-#. Show header infos
-#: ../src/prefs.c:235
-msgid "Show header information of file"
-msgstr "Vis filas hodeinformasjon"
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: ../src/cddb_dialog.c:3495
+#, c-format
+msgid "Sending request (disc ID: %s, #tracks: %u, Disc length: %u)…"
+msgstr "Sender forespørsel (plate-id: %s, #spor: %u, platelengde: %u) …"
-#: ../src/prefs.c:238
-msgid ""
-"If activated, information about the file as the bitrate, the time, the size, "
-"will be displayed under the filename entry."
-msgstr ""
-"Hvis dette er slått på, vises informasjon om fila - som bitfrekvens, "
-"varighet og størrelse - under filnavnet."
+#: ../src/cddb_dialog.c:3663
+#, c-format
+msgid "DiscID ‘%s’ gave one matching album"
+msgid_plural "DiscID ‘%s’ gave %u matching albums"
+msgstr[0] "Plate-ID «%s» samsvarte med ett album"
+msgstr[1] "Plate-ID «%s» samsvarte med %u album"
-#: ../src/prefs.c:244
-msgid "Display changed files in list using:"
-msgstr "Vis endrede filer i lista med:"
+#: ../src/charset.c:46
+msgid "Arabic (IBM-864)"
+msgstr "Arabisk (IBM-864)"
-#: ../src/prefs.c:247
-msgid "Red color"
-msgstr "Rød farge"
+#: ../src/charset.c:47
+msgid "Arabic (ISO-8859-6)"
+msgstr "Arabisk (ISO-8859-6)"
-#: ../src/prefs.c:253
-msgid "Bold style"
-msgstr "Fet stil"
+#: ../src/charset.c:48
+msgid "Arabic (Windows-1256)"
+msgstr "Arabisk (Windows-1256)"
-#. Sorting List Options
-#: ../src/prefs.c:259
-msgid "Sorting List Options"
-msgstr "Valg for listesortering"
+#: ../src/charset.c:49
+msgid "Baltic (ISO-8859-13)"
+msgstr "Baltisk (ISO-8859-13)"
-#. Sorting method
-#: ../src/prefs.c:268
-msgid "Sort the file list by:"
-msgstr "Sorter fillista etter:"
+#: ../src/charset.c:50
+msgid "Baltic (ISO-8859-4)"
+msgstr "Baltisk (ISO-8859-4)"
-#: ../src/prefs.c:278
-msgid "Ascending filename"
-msgstr "Stigende, etter filnavn"
+#: ../src/charset.c:51
+msgid "Baltic (Windows-1257)"
+msgstr "Baltisk (Windows-1257)"
-#: ../src/prefs.c:280
-msgid "Descending filename"
-msgstr "Synkende, etter filnavn"
+#: ../src/charset.c:52
+msgid "Celtic (ISO-8859-14)"
+msgstr "Keltisk (ISO-8859-14)"
-#: ../src/prefs.c:281
-msgid "Ascending title"
-msgstr "Stigende, etter tittel"
+#: ../src/charset.c:53
+msgid "Central European (IBM-852)"
+msgstr "Sentraleuropeisk (IBM-852)"
-#: ../src/prefs.c:282
-msgid "Descending title"
-msgstr "Synkende, etter tittel"
+#: ../src/charset.c:54
+msgid "Central European (ISO-8859-2)"
+msgstr "Sentraleuropeisk (ISO-8859-2)"
-#: ../src/prefs.c:283
-msgid "Ascending artist"
-msgstr "Stigende, etter artist"
+#: ../src/charset.c:55
+msgid "Central European (Windows-1250)"
+msgstr "Sentraleuropeisk (Windows-1250)"
-#: ../src/prefs.c:284
-msgid "Descending artist"
-msgstr "Synkende, etter artist"
+#: ../src/charset.c:56
+msgid "Chinese Simplified (GB18030)"
+msgstr "Kinesisk, forenklet (GB18030)"
-#: ../src/prefs.c:286
-msgid "Ascending album artist"
-msgstr "Stigende, etter albumartist"
+#: ../src/charset.c:57
+msgid "Chinese Simplified (GB2312)"
+msgstr "Kinesisk, forenklet (GB2312)"
-#: ../src/prefs.c:288
-msgid "Descending album artist"
-msgstr "Synkende, etter albumartist"
+#: ../src/charset.c:58
+msgid "Chinese Traditional (Big5)"
+msgstr "Kinesisk, tradisjonell (Big5)"
-#: ../src/prefs.c:289
-msgid "Ascending album"
-msgstr "Stigende, etter album"
+#: ../src/charset.c:59
+msgid "Chinese Traditional (Big5-HKSCS)"
+msgstr "Kinesisk, tradisjonell (Big5-HKSCS)"
-#: ../src/prefs.c:290
-msgid "Descending album"
-msgstr "Synkende, etter album"
+#: ../src/charset.c:60
+msgid "Cyrillic (IBM-855)"
+msgstr "Kyrillisk (IBM-855)"
-#: ../src/prefs.c:291
-msgid "Ascending year"
-msgstr "Stigende, etter år"
+#: ../src/charset.c:61
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "Kyrillisk (ISO-8859-5)"
+
+#: ../src/charset.c:62
+msgid "Cyrillic (ISO-IR-111)"
+msgstr "Kyrillisk (ISO-IR-111)"
-#: ../src/prefs.c:292
-msgid "Descending year"
-msgstr "Synkende, etter år"
+#: ../src/charset.c:63
+msgid "Cyrillic (KOI8-R)"
+msgstr "Kyrillisk (KOI8-R)"
-#: ../src/prefs.c:294
-msgid "Ascending disc number"
-msgstr "Stigende, etter platenummer"
+#: ../src/charset.c:64
+msgid "Cyrillic (Windows-1251)"
+msgstr "Kyrillisk (Windows-1251)"
-#: ../src/prefs.c:296
-msgid "Descending disc number"
-msgstr "Synkende, etter platenummer"
+#: ../src/charset.c:65
+msgid "Cyrillic/Russian (CP-866)"
+msgstr "Kyrillisk/russisk (CP-866)"
-#: ../src/prefs.c:298
-msgid "Ascending track number"
-msgstr "Stigende, etter spornummer"
+#: ../src/charset.c:66
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "Kyrillisk/ukrainsk (KOI8-U)"
-#: ../src/prefs.c:300
-msgid "Descending track number"
-msgstr "Synkende, etter spornummer"
+#: ../src/charset.c:67
+msgid "English (US-ASCII)"
+msgstr "Engelsk (US-ASCII)"
-#: ../src/prefs.c:301
-msgid "Ascending genre"
-msgstr "Stigende, etter sjanger"
+#: ../src/charset.c:68
+msgid "Greek (ISO-8859-7)"
+msgstr "Gresk (ISO-8859-7)"
-#: ../src/prefs.c:302
-msgid "Descending genre"
-msgstr "Synkende, etter sjanger"
+#: ../src/charset.c:69
+msgid "Greek (Windows-1253)"
+msgstr "Gresk (Windows-1253)"
-#: ../src/prefs.c:303
-msgid "Ascending comment"
-msgstr "Stigende, etter kommentar"
+#: ../src/charset.c:70
+msgid "Hebrew (IBM-862)"
+msgstr "Hebraisk (IBM-862)"
-#: ../src/prefs.c:304
-msgid "Descending comment"
-msgstr "Synkende, etter kommentar"
+#: ../src/charset.c:71
+msgid "Hebrew (Windows-1255)"
+msgstr "Hebraisk (Windows-1255)"
-#: ../src/prefs.c:306
-msgid "Ascending composer"
-msgstr "Stigende, etter komponist"
+#: ../src/charset.c:72
+msgid "Japanese (EUC-JP)"
+msgstr "Japansk (EUC-JP)"
-#: ../src/prefs.c:308
-msgid "Descending composer"
-msgstr "Synkende, etter komponist"
+#: ../src/charset.c:73
+msgid "Japanese (ISO-2022-JP)"
+msgstr "Japansk (ISO-2022-JP)"
-#: ../src/prefs.c:310
-msgid "Ascending original artist"
-msgstr "Stigende, etter opprinnelig artist"
+#: ../src/charset.c:74
+msgid "Japanese (Shift_JIS)"
+msgstr "Japansk (Shift_JIS)"
+
+#: ../src/charset.c:75
+msgid "Korean (EUC-KR)"
+msgstr "Koreansk (EUC-KR)"
-#: ../src/prefs.c:312
-msgid "Descending original artist"
-msgstr "Synkende, etter opprinnelig artist"
+#: ../src/charset.c:76
+msgid "Nordic (ISO-8859-10)"
+msgstr "Nordisk (ISO-8859-10)"
-#: ../src/prefs.c:314
-msgid "Ascending copyright"
-msgstr "Stigende, etter opphavsrett"
+#: ../src/charset.c:77
+msgid "South European (ISO-8859-3)"
+msgstr "Sør-europeisk (ISO-8859-3)"
-#: ../src/prefs.c:316
-msgid "Descending copyright"
-msgstr "Synkende, etter opphavsrett"
+#: ../src/charset.c:78
+msgid "Thai (TIS-620)"
+msgstr "Thai (TIS-620)"
-#: ../src/prefs.c:318
-msgid "Ascending URL"
-msgstr "Stigende, etter nettadresse"
+#: ../src/charset.c:79
+msgid "Turkish (IBM-857)"
+msgstr "Tyrkisk (IBM-857)"
-#: ../src/prefs.c:320
-msgid "Descending URL"
-msgstr "Synkende, etter nettadresse"
+#: ../src/charset.c:80
+msgid "Turkish (ISO-8859-9)"
+msgstr "Tyrkisk (ISO-8859-9)"
-#: ../src/prefs.c:322
-msgid "Ascending encoded by"
-msgstr "Stigende, etter kodeprogram"
+#: ../src/charset.c:81
+msgid "Turkish (Windows-1254)"
+msgstr "Tyrkisk (Windows-1254)"
-#: ../src/prefs.c:324
-msgid "Descending encoded by"
-msgstr "Synkende, etter kodeprogram"
+#. {N_("Unicode (UTF-7)"), "UTF-7" },
+#: ../src/charset.c:83
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
-#: ../src/prefs.c:326
-msgid "Ascending creation date"
-msgstr "Stigende, etter opprettelsesdato"
+#. {N_("Unicode (UTF-16BE)"), "UTF-16BE" },
+#. {N_("Unicode (UTF-16LE)"), "UTF-16LE" },
+#. {N_("Unicode (UTF-32BE)"), "UTF-32BE" },
+#. {N_("Unicode (UTF-32LE)"), "UTF-32LE" },
+#: ../src/charset.c:90
+msgid "Vietnamese (VISCII)"
+msgstr "Vietnamesisk (VISCII)"
-#: ../src/prefs.c:328
-msgid "Descending creation date"
-msgstr "Synkende, etter opprettelsesdato"
+#: ../src/charset.c:91
+msgid "Vietnamese (Windows-1258)"
+msgstr "Vietnamesisk (Windows-1258)"
-#: ../src/prefs.c:332
-msgid "Select the type of file sorting when loading a directory."
-msgstr "Velg hvordan filer skal sorteres når en mappe lastes inn."
+#: ../src/charset.c:92
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr "Visuelt hebraisk (ISO-8859-8)"
-#: ../src/prefs.c:344
-msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr ""
-"Hvis dette er slått på, skiller listesorteringa mellom små og store "
-"bokstaver."
+#: ../src/charset.c:93
+msgid "Western (IBM-850)"
+msgstr "Vestlig (IBM-850)"
-#. File Player
-#: ../src/prefs.c:348
-msgid "File Audio Player"
-msgstr "Lydspiller"
+#: ../src/charset.c:94
+msgid "Western (ISO-8859-1)"
+msgstr "Vestlig (ISO-8859-1)"
-#: ../src/prefs.c:360
-msgid "Player to run:"
-msgstr "Spiller som skal kjøres:"
+#: ../src/charset.c:95
+msgid "Western (ISO-8859-15)"
+msgstr "Vestlig (ISO-8859-15)"
-#: ../src/prefs.c:366
-msgid ""
-"Enter the program used to play the files. Some arguments can be passed for "
-"the program (as 'xmms -p') before to receive files as other arguments."
-msgstr ""
-"Skriv inn programmet som skal brukes til å spille av filene. Noen argumenter "
-"kan sendes til programmet (som f.eks. «xmms -p») før filene mottas som "
-"øvrige argumenter."
-
-#. Log options
-#: ../src/prefs.c:384
-msgid "Log Options"
-msgstr "Logg-valg"
-
-#. Show / hide log view
-#: ../src/prefs.c:391
-msgid "Show log view in main window"
-msgstr "Vis loggvisning i hovedvinduet"
-
-#: ../src/prefs.c:394
-msgid "If activated, the log view would be visible in the main window."
-msgstr "Hvis dette er slått på, er loggvisninga synlig i hovedvinduet."
-
-#: ../src/prefs.c:400
-msgid "Max number of lines:"
-msgstr "Maksimalt antall linjer:"
+#: ../src/charset.c:96
+msgid "Western (Windows-1252)"
+msgstr "Vestlig (Windows-1252)"
-#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formatted_Toggled),NULL);
-#. * g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
-#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
-#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
-#. "to receive files as other arguments."),NULL);
-#.
-#.
-#. * File Settings
-#.
-#: ../src/prefs.c:418
-msgid "File Settings"
-msgstr "Filinnstillinger"
+#: ../src/charset.c:508
+#, c-format
+msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
+msgstr "Klarte ikke å konvertere filnavnet «%s» til UTF-8. %s"
-#. File (name) Options
-#: ../src/prefs.c:424
-msgid "File Options"
-msgstr "Filvalg"
+#: ../src/charset.c:510 ../src/charset.c:623 ../src/charset.c:688
+msgid "Invalid UTF-8"
+msgstr "Ugyldig UTF-8"
-#: ../src/prefs.c:430
-msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
-msgstr "Erstatt ugyldige tegn i filnavnet (for Windows og CD-ROM)"
+#: ../src/charset.c:621
+#, c-format
+msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
+msgstr "Klarte ikke å konvertere UTF-8-strengen «%s» til filnavn-koding. %s"
-#: ../src/prefs.c:433
-msgid ""
-"Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
-"('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
-"problem when renaming the file. This is useful when renaming the file from "
-"the tag with the scanner."
-msgstr ""
-"Konverter tegn i filnavnet som er ugyldige i FAT32/16-, ISO9660- og Joliet-"
-"filsystemer («\\», «:», «;», «*», «?», «\"», «<», «>» og «|») ved "
-"navneendring for å unngå problemer. Dette er nyttig når du bruker skanneren "
-"til å endre navn på fila basert på taggen."
+#: ../src/charset.c:686
+#, c-format
+msgid "The string ‘%s’ could not be converted into UTF-8: %s"
+msgstr "Klarte ikke å konverter strengen «%s» til UTF-8. %s"
-#. Extension case (lower/upper?)
-#: ../src/prefs.c:441
-msgid "Convert filename extension to:"
-msgstr "Endre filetternavn til:"
+#: ../src/easytag.c:251
+#, c-format
+msgid "A file was changed by an external program"
+msgid_plural "%d files were changed by an external program"
+msgstr[0] "En fil er endret av et eksternt program"
+msgstr[1] "%d filer er endret av et eksternt program"
-#: ../src/prefs.c:444
-msgid "Lower Case"
-msgstr "Små bokstaver"
+#: ../src/easytag.c:260
+msgid "Do you want to continue saving the file?"
+msgstr "Er du sikker på at du vil lagre filen?"
-#: ../src/prefs.c:447
-msgid "For example, the extension will be converted to '.mp3'"
-msgstr "Filetternavnet blir for eksempel endret til «.mp3»"
+#: ../src/easytag.c:321 ../src/easytag.c:342
+msgid "Saving files was stopped"
+msgstr "Fillagring ble stoppet"
-#: ../src/prefs.c:450
-msgid "Upper Case"
-msgstr "Store bokstaver"
+#: ../src/easytag.c:344
+msgid "All files have been saved"
+msgstr "Alle filer er lagret"
-#: ../src/prefs.c:453
-msgid "For example, the extension will be converted to '.MP3'"
-msgstr "Filetternavnet blir for eksempel endret til «.MP3»"
+#: ../src/easytag.c:463
+#, c-format
+msgid "Do you want to write the tag of file ‘%s’?"
+msgstr "Er du sikker på at du vil lagre tagg for filen «%s»?"
-#: ../src/prefs.c:456
-msgid "No Change"
-msgstr "Ingen endring"
+#: ../src/easytag.c:465
+msgid "Confirm Tag Writing"
+msgstr "Bekreft taggskriving"
-#: ../src/prefs.c:459
-msgid "The extension will not be converted"
-msgstr "Utvidelsen blir ikke konvertert"
+#. Directories and filename changed
+#: ../src/easytag.c:566
+msgid "Rename File and Directory"
+msgstr "Gi nytt navn til fil og mappe"
-#. Preserve modification time
-#: ../src/prefs.c:462
-msgid "Preserve modification time of the file"
-msgstr "Behold endringstidspunkt for fila"
+#: ../src/easytag.c:567
+msgid "File and directory rename confirmation required"
+msgstr "Navneendring av fil- og mappenavn må bekreftes"
-#: ../src/prefs.c:465
-msgid ""
-"Preserve the modification time (in file properties) when saving the file."
-msgstr "Behold endringstidspunktet (i filegenskapene) når fila lagres."
+#: ../src/easytag.c:568
+#, c-format
+msgid "Do you want to rename the file and directory ‘%s’ to ‘%s’?"
+msgstr "Er du sikker på at du vil endre navn på filen og mappen «%s» til «%s»?"
-#. Change directory modification time
-#: ../src/prefs.c:469
-msgid ""
-"Update modification time of the parent directory of the file (recommended "
-"when using Amarok)"
-msgstr ""
-"Oppdater foreldermappas endringstidspunkt (anbefales ved bruk av Amarok)"
+#: ../src/easytag.c:574
+msgid "Directory rename confirmation required"
+msgstr "Navneendring av mappe må bekreftes"
-#: ../src/prefs.c:473
-msgid ""
-"The modification time of the parent directory of the file will be updated "
-"when saving tag the file. At the present time it is automatically done only "
-"when renaming a file.\n"
-"This feature is interesting when using applications like Amarok. For "
-"performance reasons, they refresh file information by detecting changes of "
-"the parent directory."
-msgstr ""
-"Endringstidspunktet for filas foreldermappe kan bli oppdatert når du tagger "
-"fila. Ved nåværende tidspunkt blir dette bare gjort automatisk når en fil "
-"får nytt navn.\n"
-"Denne funksjonen er interessant når du bruker programmer som frisker opp fil-"
-"biblioteket sitt basert på når foreldermappe(r) blir endret (f.eks. Amarok)."
-
-#. Character Set for Filename
-#: ../src/prefs.c:481
-msgid "Character Set for Filename"
-msgstr "Tegnsett som brukes i filnavn"
-
-#. Rules for character set
-#: ../src/prefs.c:493
-msgid ""
-"Rules to apply if some characters can't be converted to the system character "
-"encoding when writing filename:"
-msgstr ""
-"Regler som skal gjelde hvis enkelte tegn ikke kan konverteres til systemets "
-"tegnkoding når filnavnet skrives:"
+#: ../src/easytag.c:575
+#, c-format
+msgid "Do you want to rename the directory ‘%s’ to ‘%s’?"
+msgstr "Er du sikker på at du vil gi mappen «%s» det nye navnet «%s»?"
-#: ../src/prefs.c:499
-msgid "Try another character encoding"
-msgstr "Prøv en annen tegnkoding"
+#: ../src/easytag.c:583
+msgid "File rename confirmation required"
+msgstr "Navneendring av fil må bekreftes"
-#: ../src/prefs.c:503
-msgid ""
-"With this option, it will try the conversion to the encoding associated to "
-"your locale (for example: ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
-"for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
-msgstr ""
-"Med dette valget forsøker konverteringa å bruke kodingen som gjelder for din "
-"region (for eksempel ISO-8859-1 for «fr», KOI8-R for «ru» eller ISO-8859-2 "
-"for «ro»). Hvis dette mislykkes, brukes tegnkodingen ISO-8859-1."
+#: ../src/easytag.c:584
+#, c-format
+msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
+msgstr "Er du sikker på at du vil endre navnet på filen «%s» til «%s»?"
-#: ../src/prefs.c:510
-msgid ""
-"Force using the system character encoding and activate the transliteration"
-msgstr "Tving bruk av systemets tegnkoding, og aktiver translitterasjon"
+#: ../src/easytag.c:654
+#, c-format
+msgid "Cannot rename file ‘%s’ to ‘%s’"
+msgstr "Klarte ikke å gi filen «%s» det nye navnet «%s»"
-#: ../src/prefs.c:514 ../src/prefs.c:844 ../src/prefs.c:913
-msgid ""
-"With this option, when a character cannot be represented in the target "
-"character set, it can be approximated through one or several similarly "
-"looking characters."
-msgstr ""
-"Med dette valget erstattes tegn som ikke kan brukes innenfor ønsket tegnsett "
-"med et lignende tegn."
+#: ../src/easytag.c:668
+#, c-format
+msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
+msgstr "Klarte ikke å gi filen «%s» det nye navnet «%s». %s"
-#: ../src/prefs.c:520
-msgid ""
-"Force using the system character encoding and silently discard some "
-"characters"
-msgstr ""
-"Tving bruk av systemets tegnkoding, og fjern enkelte tegn uten å si i fra"
+#: ../src/easytag.c:673
+msgid "File(s) not renamed"
+msgstr "Filnavn(et/ene) ble ikke endret"
-#: ../src/prefs.c:524 ../src/prefs.c:854 ../src/prefs.c:923
-msgid ""
-"With this option, when a character cannot be represented in the target "
-"character set, it will be silently discarded."
-msgstr ""
-"Med dette valget fjernes tegn som ikke kan brukes innenfor ønsket tegnsett, "
-"uten advarsel."
+#: ../src/easytag.c:858
+#, c-format
+msgid "Writing tag of ‘%s’"
+msgstr "Lagrer tagg i «%s»"
-#.
-#. * Tag Settings
-#.
-#: ../src/prefs.c:533
-msgid "Tag Settings"
-msgstr "Tagg-innstillinger"
+#: ../src/easytag.c:866
+#, c-format
+msgid "Wrote tag of ‘%s’"
+msgstr "Tagg er lagret for «%s»"
-#. Tag Options
-#: ../src/prefs.c:539
-msgid "Tag Options"
-msgstr "Tagg-valg"
+#: ../src/easytag.c:882
+#, c-format
+msgid "Cannot write tag in file ‘%s’"
+msgstr "Klarte ikke å skrive tagg til filen «%s»"
-#: ../src/prefs.c:545
-msgid "Auto completion of date if not complete"
-msgstr "Autofullføring av evt. ufullstendig dato "
+#: ../src/easytag.c:886
+msgid "Tag Write Error"
+msgstr "Feil ved skriving av tagg"
-#: ../src/prefs.c:548
-msgid ""
-"Try to complete the year field if you enter only the last numerals of the "
-"date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
-"1996, 95 => 1995…)."
-msgstr ""
-"Prøv å fullføre år-feltet hvis du skriver inn et ufullstendig tall (f.eks., "
-"hvis nåværende år er 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 => 1995, "
-"osv.)."
+#: ../src/easytag.c:961 ../src/easytag.c:1192
+#, c-format
+msgid "Cannot read directory ‘%s’"
+msgstr "Klarte ikke å lese mappen «%s»"
-#: ../src/prefs.c:556
-msgid "Write the track field with the following number of digits:"
-msgstr "Skriv spornummer-feltet med følgende antall sifre:"
+#: ../src/easytag.c:965
+msgid "Directory Read Error"
+msgstr "Feil ved lesing av mappe"
-#: ../src/prefs.c:559
-msgid ""
-"If activated, the track field is written using the number '0' as padding to "
-"obtain a number with 'n' digits (for example, with two digits: '05', '09', "
-"'10'…). Else it keeps the 'raw' track value."
-msgstr ""
-"Hvis dette er slått på, skrives spornummer-feltet med «0» som ledende siffer "
-"der det er nødvendig (f.eks. «05», «09» og «10»). Ellers beholdes alle "
-"spornummer uten ledende sifre."
+#. Read the directory recursively
+#: ../src/easytag.c:986
+#, c-format
+msgid "Search in progress…"
+msgstr "Søker …"
-#: ../src/prefs.c:578
-msgid "Write the disc field with the following number of digits:"
-msgstr "Skriv platenummer-feltet med følgende antall sifre:"
+#: ../src/easytag.c:1010 ../src/file.c:1195
+#, c-format
+msgid "File: ‘%s’"
+msgstr "Fil: «%s»"
-#: ../src/prefs.c:583
-msgid "Whether to pad the disc field with leading zeroes"
-msgstr "Om platenummer-feltet skal fylles ut med ledende nuller"
+#: ../src/easytag.c:1060
+#, c-format
+msgid "Found one file in this directory and subdirectories"
+msgid_plural "Found %u files in this directory and subdirectories"
+msgstr[0] "Fant én fil i denne mappen inkl. undermapper"
+msgstr[1] "Fant %u filer i denne mappen inkl. undermapper"
-#: ../src/prefs.c:613
-msgid ""
-"Tag field focus when switching files in list with shortcuts Page Up/Page "
-"Down:"
-msgstr ""
-"Taggfelt-fokus ved bytte mellom filer i lista med snarveisknappene Page Up / "
-"Page Down:"
+#: ../src/easytag.c:1067
+#, c-format
+msgid "Found one file in this directory"
+msgid_plural "Found %u files in this directory"
+msgstr[0] "Fant én fil i denne mappen"
+msgstr[1] "Fant %u filer i denne mappen"
-#: ../src/prefs.c:619
-msgid "Keep focus to the same tag field"
-msgstr "Fokuser på samme tagg-felt"
+#: ../src/easytag.c:1084
+msgid "No file found in this directory and subdirectories"
+msgstr "Fant ingen filer i denne mappen, og heller ikke i undermapper"
-#: ../src/prefs.c:625
-msgid "Return focus to the first tag field (i.e. 'Title' field)"
-msgstr "Fokuser på første taggefeltet («Tittel»-feltet) igjen"
+#: ../src/easytag.c:1086
+msgid "No file found in this directory"
+msgstr "Fant ingen filer i denne mappen"
-#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
-#. Tag Splitting
-#: ../src/prefs.c:630
-msgid "Tag Splitting"
-msgstr "Tagg-splitting"
+#: ../src/easytag.c:1156
+#, c-format
+msgid "Error opening directory ‘%s’: %s"
+msgstr "Det oppstod en feil under åpning av «%s». %s"
-#: ../src/prefs.c:639
-msgid ""
-"For Vorbis tags, selected fields will be split at dashes and saved as "
-"separate tags"
-msgstr ""
-"I Vorbis-tagger deles valgte felter opp ved streker, og lagres som separate "
-"tagger"
+#: ../src/easytag.c:1212
+msgid "Searching for audio files…"
+msgstr "Søker etter lydfiler …"
-#: ../src/prefs.c:649
-msgid "Original artist"
-msgstr "Opprinnelig artist"
+#: ../src/easytag.c:1213
+msgid "Searching"
+msgstr "Søker"
-#.
-#. * ID3 Tag Settings
-#.
-#: ../src/prefs.c:670
-msgid "ID3 Tag Settings"
-msgstr "Innstillinger for ID3-tagger"
+#: ../src/easytag.c:1214
+msgid "_Stop"
+msgstr "_Stopp"
-#. Tag Rules frame
-#: ../src/prefs.c:679
-msgid "ID3 Tag Rules"
-msgstr "Regler for ID3-tagger"
+#: ../src/file_area.c:285 ../src/file_area.c:340
+msgid "File not found"
+msgstr "Fant ikke filen"
-#. Strip tag when fields (managed by EasyTAG) are empty
-#: ../src/prefs.c:691
-msgid "Strip tags if all fields are set to blank"
-msgstr "Tøm alle tagger hvis alle felter er blanke"
+#: ../src/file_area.c:290 ../src/load_files_dialog.c:223
+#, c-format
+msgid "Cannot query file information ‘%s’"
+msgstr "Klarte ikke å spørre etter filinformasjon «%s»"
-#: ../src/prefs.c:694
-msgid ""
-"As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
-"Genre or Comment (as an attached image, lyrics…), this option allows you to "
-"strip the whole tag when these seven standard data fields have been set to "
-"blank."
-msgstr ""
-"Ettersom ID3v2-tagger kan inneholde annen data enn spornavn, artist, album, "
-"år, spornummer, sjanger og/eller kommentar (som f.eks. cover-bilde og "
-"sangtekst), kan du bruke dette valget til å fjerne hele taggen når "
-"overnevnte standardfelt er tomme."
+#: ../src/file_area.c:324
+msgid "Read-only file"
+msgstr "Skrivebeskyttet fil"
-#. Convert old ID3v2 tag version
-#: ../src/prefs.c:700
-msgid "Automatically convert old ID3v2 tag versions"
-msgstr "Konverter gamle ID3v2-tagger automatisk"
+#: ../src/file_list.c:250
+#, c-format
+msgid "Error reading ID3 tag from file ‘%s’: %s"
+msgstr "Det oppstod en feil under lesing av ID3-tagg fra filen «%s». %s"
-#: ../src/prefs.c:703
-msgid ""
-"If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
-"ID3v2.3 version."
-msgstr ""
-"Hvis dette er slått på, oppdateres gamle ID3v2-tagger (som f.eks. ID3v2.2) "
-"til ID3v2.3."
+#: ../src/file_list.c:261
+#, c-format
+msgid "Error reading tag from Ogg file ‘%s’: %s"
+msgstr "Det oppstod en feil under lesing av tagg fra ogg-filen «%s». %s"
-#. Use CRC32
-#: ../src/prefs.c:707
-msgid "Use CRC32"
-msgstr "Bruk CRC32"
+#: ../src/file_list.c:272
+#, c-format
+msgid "Error reading tag from FLAC file ‘%s’: %s"
+msgstr "Det oppstod en feil under lesing av tagg fra FLAC-filen «%s». %s"
-#: ../src/prefs.c:710
-msgid "Set CRC32 in the ID3v2 tags"
-msgstr "Ta med CRC32 i ID3v2-taggene"
+#: ../src/file_list.c:282
+#, c-format
+msgid "Error reading APE tag from file ‘%s’: %s"
+msgstr "Det oppstod en feil under lesing av tagg fra APE-filen «%s». %s"
-#. Use Compression
-#: ../src/prefs.c:713
-msgid "Use Compression"
-msgstr "Bruk komprimering"
+#: ../src/file_list.c:292
+#, c-format
+msgid "Error reading tag from MP4 file ‘%s’: %s"
+msgstr "Det oppstod en feil under lesing av tagg fra MP4-filen «%s». %s"
-#: ../src/prefs.c:717
-msgid "Set Compression in the ID3v2 tags"
-msgstr "Ta med komprimeringsgrad i ID3v2-taggene"
+#: ../src/file_list.c:303
+#, c-format
+msgid "Error reading tag from WavPack file ‘%s’: %s"
+msgstr "Det oppstod en feil under lesing av tagg fra WavPack-filen «%s». %s"
-#. Write Genre in text
-#: ../src/prefs.c:720
-msgid "Write Genre in text only"
-msgstr "Bare skriv sjanger i tekstform"
+#: ../src/file_list.c:314
+#, c-format
+msgid "Error reading tag from Opus file ‘%s’: %s"
+msgstr "Det oppstod en feil under lesing av tagg fra Opus-filen «%s». %s"
-#: ../src/prefs.c:724
+#: ../src/file_list.c:332
+#, c-format
msgid ""
-"Don't use ID3v1 number references in genre tag. Enable this if you see "
-"numbers as genre in your music player."
+"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
+"be lost when saving"
msgstr ""
-"Ikke bruk ID3v1-tallreferanser i sjanger-taggen. Slå på dette hvis du ser "
-"tallverdier i sjangerfeltet i musikkavspilleren."
-
-#. Character Set for writing ID3 tag
-#: ../src/prefs.c:727
-msgid "Character Set for writing ID3 tags"
-msgstr "Tegnsett som brukes til å skrive ID3-tagger"
+"År-verdien «%s» i filen «%s» ser ut til å være ugyldig. Denne informasjonen "
+"går tapt når du lagrer"
-#. ID3v2 tags
-#: ../src/prefs.c:734
-msgid "ID3v2 tags"
-msgstr "ID3v2-tagger"
+#: ../src/file_list.c:470
+#, c-format
+msgid "Automatic corrections applied for file ‘%s’"
+msgstr "filen «%s» ble automatisk korrigert."
-#. Write ID3v2 tag
-#: ../src/prefs.c:747
-msgid "Write ID3v2 tag"
-msgstr "Skriv ID3v2-tagg"
+#. And refresh the number of files in this directory
+#: ../src/file.c:1219
+#, c-format
+msgid "One file"
+msgid_plural "%u files"
+msgstr[0] "Én fil"
+msgstr[1] "%u filer"
-#: ../src/prefs.c:750
-msgid ""
-"If activated, an ID3v2.4 tag will be added or updated at the beginning of "
-"the MP3 files. Else it will be stripped."
-msgstr ""
-"Hvis dette er slått på, legges til eller oppdateres en ID3v2.4-tagg i "
-"slutten av MP3-filer. Ellers fjernes ID3v2.4-taggen."
+#. Bitrate
+#: ../src/file.c:1254 ../src/tags/flac_header.c:172
+#: ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:252 ../src/tags/musepack_header.c:86
+#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:230
+#: ../src/tags/wavpack_header.c:145
+#, c-format
+msgid "%d kb/s"
+msgstr "%d kb/s"
-#. ID3v2 tag version
-#: ../src/prefs.c:757
-msgid "Version:"
-msgstr "Versjon:"
+#. Samplerate
+#: ../src/file.c:1257 ../src/tags/flac_header.c:175
+#: ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148
+#: ../src/tags/mpeg_header.c:257 ../src/tags/musepack_header.c:89
+#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:233
+#: ../src/tags/wavpack_header.c:148
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
-#: ../src/prefs.c:763
-msgid ""
-"Select the ID3v2 tag version to write:\n"
-" - ID3v2.3 is written using id3lib,\n"
-" - ID3v2.4 is written using libid3tag (recommended)."
+#: ../src/file.c:1382
+#, c-format
+msgid "Could not convert filename ‘%s’ to system filename encoding"
msgstr ""
-"Velg ID3v2-tagg-versjonen som skal skrives:\n"
-" - ID3v2.3 skrives med id3lib, og\n"
-" - ID3v2.4 skrives med libid3tag (anbefales)."
-
-#. Charset
-#. Id3V1 writing character set
-#: ../src/prefs.c:778 ../src/prefs.c:882
-msgid "Charset:"
-msgstr "Tegnsett:"
+"Klarte ikke å konvertere filnavnet «%s» til systemets filnavn-tegnkoding"
-#. Unicode
-#: ../src/prefs.c:783
-msgid "Unicode "
-msgstr "Unicode "
+#: ../src/file.c:1384
+msgid "Try setting the environment variable G_FILENAME_ENCODING."
+msgstr "Prøv å definere miljøvariabelen G_FILENAME_ENCODING."
-#: ../src/prefs.c:791
-msgid "Unicode type to use"
-msgstr "Unicode-type som skal brukes"
+#: ../src/file.c:1385 ../src/scan_dialog.c:817
+msgid "Filename translation"
+msgstr "Filnavn-oversettelse"
-#: ../src/prefs.c:815
-msgid "Character set used to write the tag data in the file."
-msgstr "Tegnsett som brukes til å skrive taggdata til fila."
+#: ../src/load_files_dialog.c:293
+#, c-format
+msgid "Error reading file ‘%s’"
+msgstr "Det oppstod en feil under lesing av «%s»"
-#. ID3v2 Additional iconv() options
-#. ID3V1 Additional iconv() options
-#: ../src/prefs.c:825 ../src/prefs.c:894
-msgid "Additional settings for iconv():"
-msgstr "Tilleggsinnstillinger for iconv():"
+#: ../src/load_files_dialog.c:633 ../src/load_files_dialog.c:736
+msgid "Insert a blank line"
+msgstr "Sett inn en tom linje"
-#: ../src/prefs.c:831 ../src/prefs.c:900
-msgid "No"
-msgstr "Nei"
+#: ../src/load_files_dialog.c:637 ../src/load_files_dialog.c:740
+msgid "Delete this line"
+msgstr "Slett denne linja"
-#: ../src/prefs.c:835 ../src/prefs.c:904
-msgid ""
-"With this option, when a character cannot be represented in the target "
-"character set, it isn't changed. But note that an error message will be "
-"displayed for information."
-msgstr ""
-"Med dette valget fjernes ikke tegn som ligger utenfor ønsket tegnsett. Du "
-"får likevel en feilmelding når slike tegn oppdages."
+#: ../src/load_files_dialog.c:648 ../src/load_files_dialog.c:751
+msgid "Move this line up"
+msgstr "Flytt denne linja opp"
-#: ../src/prefs.c:840 ../src/prefs.c:909
-msgid "//TRANSLIT"
-msgstr "//TRANSLIT"
+#: ../src/load_files_dialog.c:652 ../src/load_files_dialog.c:755
+msgid "Move this line down"
+msgstr "Flytt denne linja opp"
-#: ../src/prefs.c:850 ../src/prefs.c:919
-msgid "//IGNORE"
-msgstr "//IGNORE"
+#: ../src/load_files_dialog.c:898
+msgid "Load Filenames From a Text File"
+msgstr "Last inn filnavn fra en tekstfil"
-#. ID3v1 tags
-#: ../src/prefs.c:859
-msgid "ID3v1 tags"
-msgstr "ID3v1-tagger"
+#: ../src/misc.c:184
+msgid "You must type a program name"
+msgstr "Du må skrive inn et programnavn"
-#. Write ID3v1 tag
-#: ../src/prefs.c:873
-msgid "Write ID3v1.x tag"
-msgstr "Skriv ID3v1.x-tagg"
+#: ../src/misc.c:185
+msgid "Program Name Error"
+msgstr "Feil i programnavn"
-#: ../src/prefs.c:876
-msgid ""
-"If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
-"files. Else it will be stripped."
-msgstr ""
-"Hvis dette er slått på, legges til eller oppdateres en ID3v1-tagg i slutten "
-"av MP3-filer. Ellers fjernes ID3v1-taggen."
+#: ../src/picture.c:175
+msgid "JPEG image"
+msgstr "JPEG-bilde"
-#: ../src/prefs.c:890
-msgid "Character set used to write ID3v1 tag data in the file."
-msgstr "Tegnsett som brukes til å skrive ID3v1-taggdata til fila."
+#: ../src/picture.c:177
+msgid "PNG image"
+msgstr "PNG-bilde"
-#. Character Set for reading tag
-#: ../src/prefs.c:928
-msgid "Character Set for reading ID3 tags"
-msgstr "Tegnsett som brukes til å lese ID3-tagger"
+#: ../src/picture.c:179
+msgid "GIF image"
+msgstr "GIF-bilde"
-#: ../src/prefs.c:942
-msgid "Non-standard:"
-msgstr "Ikke-standard:"
+#: ../src/picture.c:182
+msgid "Unknown image"
+msgstr "Ukjent bilde"
-#: ../src/prefs.c:948
-msgid ""
-"This character set will be used when reading the tag data, to convert each "
-"string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
-"tag).\n"
-"\n"
-"For example:\n"
-" - In previous versions of EasyTAG, you could save UTF-8 strings in an "
-"ISO-8859-1 field. This is not correct. To convert these tags to Unicode: "
-"activate this option and select UTF-8. You must also activate above the "
-"option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
-"UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
-" - If Unicode was not used, Russian people can select the character set "
-"'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
-"written under Unix systems."
-msgstr ""
-"Dette tegnsettet blir brukt ved lesing av tagg-dataene for å konvertere hver "
-"streng som finnes i et ISO-8859-1-taggfelt (for ID3v2- og/eller ID3v1-"
-"tagger).\n"
-"\n"
-"For eksempel:\n"
-" - I tildigere versjoner av EasyTAG var det mulig å lagre UTF-8-strenger i "
-"ISO-8859-1-felter. Slik bør det ikke være. Aktiver dette valget og velg "
-"UTF-8 for å konvertere disse taggene til Unicode. Du må også slå på valget "
-"«Prøv å lagre tagger i ISO-8859-1. Hvis det ikke er mulig, bruk UNICODE "
-"(anbefales)» eller «Lagre alltid tagger med UNICODE-tegnsett» ovenfor.\n"
-" - Russiske brukere kan velge tegnsettet «Windows-1251» for å laste inn "
-"tagger som er skrevet med Windows hvis Unicode ikke er brukt. «KOI8-R» kan "
-"brukes for å laste inn tagger som er skrevet med Unix-systemer."
-
-#: ../src/prefs.c:966
-msgid "Character set used to read tag data in the file."
-msgstr "Tegnsett som brukes til å lese taggdata i fila."
+#: ../src/picture.c:194
+msgid "32×32 pixel PNG file icon"
+msgstr "PNG-filikon av 32x32 piksler"
-#.
-#. * Scanner
-#.
-#: ../src/prefs.c:980
-msgid "Scanner"
-msgstr "Skanner"
+#: ../src/picture.c:196
+msgid "Other file icon"
+msgstr "Annet filikon"
-#. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: ../src/prefs.c:990
-msgid "Fill Tag Scanner - Character Conversion"
-msgstr "Fyll tagg-skanner - tegnkonvertering"
+#: ../src/picture.c:198
+msgid "Cover (front)"
+msgstr "Omslag (framside)"
-#: ../src/prefs.c:996 ../src/prefs.c:1021
-msgid "Convert underscore character '_' and string '%20' to space ' '"
-msgstr "Endre understrek («_») og strengen «%20» til mellomrom"
+#: ../src/picture.c:200
+msgid "Cover (back)"
+msgstr "Omslag (bakside)"
-#: ../src/prefs.c:998 ../src/prefs.c:1022
-msgid "Convert space ' ' to underscore '_'"
-msgstr "Endre mellomrom til understrek «_»"
+#: ../src/picture.c:202
+msgid "Leaflet page"
+msgstr "Leaflet-side"
-#: ../src/prefs.c:1010 ../src/prefs.c:1012
-msgid ""
-"If activated, this conversion will be used when applying a mask from the "
-"scanner for tags."
-msgstr ""
-"Hvis dette er slått på, brukes denne konverteringa når en maske brukes på "
-"tagger."
+#: ../src/picture.c:204
+msgid "Media (such as label side of CD)"
+msgstr "Medium (f.eks. etikettsiden av en CD)"
-#. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: ../src/prefs.c:1016
-msgid "Rename File Scanner - Character Conversion"
-msgstr "Navneendring-skanner - tegnkonvertering"
+#: ../src/picture.c:206
+msgid "Lead artist/lead performer/soloist"
+msgstr "Hovedartist/hovedutøver/solist"
-#: ../src/prefs.c:1033 ../src/prefs.c:1035 ../src/prefs.c:1037
-msgid ""
-"If activated, this conversion will be used when applying a mask from the "
-"scanner for filenames."
-msgstr ""
-"Hvis dette er slått på, brukes denne konverteringa når en skannermaske "
-"brukes på filnavn."
+#: ../src/picture.c:208
+msgid "Artist/performer"
+msgstr "Artist/utøver"
-#. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: ../src/prefs.c:1040
-msgid "Process Fields Scanner - Character Conversion"
-msgstr "Feltbehandlingsskanner - tegnkonvertering"
+#: ../src/picture.c:210
+msgid "Conductor"
+msgstr "Dirigent"
-#. Don't convert some words like to, feat. first letter uppercase.
-#: ../src/prefs.c:1047
-msgid ""
-"Don't uppercase first letter of words for some prepositions and articles."
-msgstr ""
-"Ikke gi stor forbokstav til ord som er preposisjoner og bestemt-artikler."
+#: ../src/picture.c:212
+msgid "Band/Orchestra"
+msgstr "Band/Orkester"
-#: ../src/prefs.c:1051
-msgid ""
-"Don't convert first letter of words like prepositions, articles and words "
-"like feat., when using the scanner 'First letter uppercase of each "
-"word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
-"An Entry')."
-msgstr ""
-"Ikke endre første bokstav i ord som er preposisjoner, bestemte artikler og "
-"ord som «feat.» ved bruk av skanneren «Stor forbokstav i hvert ord» (for "
-"eksempel blir «Tekst i en Oppføring» ikke endret til «Tekst I En Oppføring»)."
+#: ../src/picture.c:216
+msgid "Lyricist/text writer"
+msgstr "Lyriker/tekstforfatter"
-#. Properties of the scanner window
-#: ../src/prefs.c:1057
-msgid "Scanner Window"
-msgstr "Skannervindu"
+#: ../src/picture.c:218
+msgid "Recording location"
+msgstr "Opptakssted"
-#: ../src/prefs.c:1063
-msgid "Open the Scanner Window on startup"
-msgstr "Åpne skannervinduet når programmet starter"
+#: ../src/picture.c:220
+msgid "During recording"
+msgstr "Under opptak"
-#: ../src/prefs.c:1066
-msgid ""
-"Activate this option to open automatically the scanner window when EasyTAG "
-"starts."
-msgstr ""
-"Bruk dette valget for å åpne skannervinduet automatisk når EasyTAG starter "
-"opp."
+#: ../src/picture.c:222
+msgid "During performance"
+msgstr "Under fremføring"
-#. Other options
-#: ../src/prefs.c:1071
-msgid "Fields"
-msgstr "Felt"
+#: ../src/picture.c:224
+msgid "Movie/video screen capture"
+msgstr "Film/video med skjermopptak"
-#. Overwrite text into tag fields
-#: ../src/prefs.c:1078
-msgid "Overwrite fields when scanning tags"
-msgstr "Overskriv felter når tagger gjennomsøkes"
+#: ../src/picture.c:226
+msgid "A bright colored fish"
+msgstr "En lysfarget fisk"
-#: ../src/prefs.c:1081
-msgid ""
-"If activated, the scanner will replace existing text in fields by the new "
-"one. If deactivated, only blank fields of the tag will be filled."
-msgstr ""
-"Hvis dette er slått på, erstatter skanneren eksisterende tekst i felter med "
-"ny tekst. Ellers fylles bare tomme tagg-felter med tekst."
+#: ../src/picture.c:228
+msgid "Illustration"
+msgstr "Illustrasjon"
-#: ../src/prefs.c:1092
-msgid "Set this text as default comment:"
-msgstr "Bruk denne teksten som standardkommentar:"
+#: ../src/picture.c:230
+msgid "Band/Artist logotype"
+msgstr "Band-/artist-logotype"
-#: ../src/prefs.c:1095
-msgid ""
-"Activate this option if you want to put the following string into the "
-"comment field when using the 'Fill Tag' scanner."
-msgstr ""
-"Bruk dette valget hvis du vil legge følgende streng i kommentarfeltet når du "
-"bruker «Fyll ut tagg»-skanneren."
+#: ../src/picture.c:232
+msgid "Publisher/studio logotype"
+msgstr "Utgiver/studio-logotype"
-#. CRC32 comment
-#: ../src/prefs.c:1113
-msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
-msgstr "Bruk CRC32 som standardkommentar (bare på filer med ID3-tagger)."
+#: ../src/picture.c:236
+msgid "Unknown image type"
+msgstr "Ukjent bildetype"
-#: ../src/prefs.c:1117
-msgid ""
-"Calculates the CRC-32 value of the file and writes it into the comment field "
-"when using the 'Fill Tag' scanner."
-msgstr ""
-"Regner ut CRC-32-verdien av fila og legger verdien i kommentarfeltet når du "
-"bruker «Fyll ut tagg»-skanneren."
+#: ../src/picture.c:262 ../src/picture.c:268
+msgid "pixels"
+msgstr "piksler"
-#.
-#. * CDDB
-#.
-#: ../src/prefs.c:1128
-msgid "CDDB"
-msgstr "CDDB"
+#: ../src/picture.c:262 ../src/picture.c:268
+msgid "Type"
+msgstr "Type"
-#. CDDB Server Settings (Automatic Search)
-#: ../src/prefs.c:1134
-msgid "Server Settings for Automatic Search"
-msgstr "Tjenerinnstillinger for automatisk søk"
+#: ../src/playlist_dialog.c:541
+#, c-format
+msgid "Cannot write playlist file ‘%s’"
+msgstr "Klarte ikke å lagre spilleliste-filen «%s»"
-#: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
-msgid "Name:"
-msgstr "Navn:"
+#: ../src/playlist_dialog.c:545
+msgid "Playlist File Error"
+msgstr "Feil med spillelistefil"
-#: ../src/prefs.c:1162 ../src/prefs.c:1190 ../src/prefs.c:1225
-#: ../src/prefs.c:1310
-msgid "Port:"
-msgstr "Port:"
+#: ../src/playlist_dialog.c:553
+#, c-format
+msgid "Wrote playlist file ‘%s’"
+msgstr "Spillelistefil «%s» er lagret"
-#: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
-msgid "CGI Path:"
-msgstr "CGI-sti:"
+#: ../src/playlist_dialog.c:635 ../src/scan_dialog.c:2820
+#: ../src/scan_dialog.c:2882
+msgid "Invalid scanner mask"
+msgstr "Ugyldig skannermaske"
-#. CDDB Server Settings (Manual Search)
-#: ../src/prefs.c:1208
-msgid "Server Settings for Manual Search"
-msgstr "Tjenerinnstillinger for manuelt søk"
+#: ../src/playlist_dialog.c:666
+msgid "Generate Playlist"
+msgstr "Lag spilleliste"
-#. Local access for CDDB (Automatic Search)
-#: ../src/prefs.c:1242
-msgid "Local CDDB"
-msgstr "Lokal CDDB"
+#. The window
+#: ../src/preferences_dialog.c:289
+msgid "Preferences"
+msgstr "Innstillinger"
-#: ../src/prefs.c:1250
-msgid "Path:"
-msgstr "Sti:"
+#: ../src/preferences_dialog.c:1126
+msgid "The selected default path is invalid"
+msgstr "Valgt standardsti er ugyldig"
-#: ../src/prefs.c:1262
+#: ../src/preferences_dialog.c:1128
+#, c-format
msgid ""
-"Specify the directory where the local CD database is located. The local CD "
-"database contains the eleven following directories 'blues', 'classical', "
-"'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
-"and 'misc'."
+"Path: ‘%s’\n"
+"Error: %s"
msgstr ""
-"Oppgi mappa hvor den lokale CD-databasen ligger. Databasen inneholder de "
-"elleve følgende mappene: «blues», «classical», «country», «data», «folk», "
-"«jazz», «newage», «reggae», «rock», «soundtrack» og «misc»."
-
-#. CDDB Proxy Settings
-#: ../src/prefs.c:1288
-msgid "Proxy Settings"
-msgstr "Mellomtjener-innstillinger"
+"Sti: «%s»\n"
+"Feil: %s"
-#: ../src/prefs.c:1297
-msgid "Use a proxy"
-msgstr "Bruk en mellomtjener"
+#: ../src/preferences_dialog.c:1132
+msgid "Invalid Path Error"
+msgstr "Ugyldig sti-feil"
-#: ../src/prefs.c:1300
-msgid "Set active the settings of the proxy server."
-msgstr "Slå på mellomtjener-innstillingene."
+#: ../src/scan_dialog.c:404
+#, c-format
+msgid "Cannot calculate CRC value of file ‘%s’"
+msgstr "Klarte ikke å regne ut CRC-verdi av «%s»"
-#: ../src/prefs.c:1302
-msgid "Host Name:"
-msgstr "Vertsnavn:"
+#: ../src/scan_dialog.c:419
+msgid "Tag successfully scanned"
+msgstr "Taggen ble skannet"
-#: ../src/prefs.c:1309
-msgid "Name of the proxy server."
-msgstr "Navn på mellomtjeneren."
+#: ../src/scan_dialog.c:422
+#, c-format
+msgid "Tag successfully scanned ‘%s’"
+msgstr "Taggen «%s» ble skannet"
-#: ../src/prefs.c:1317
-msgid "Port of the proxy server."
-msgstr "Port på mellomtjeneren."
+#: ../src/scan_dialog.c:465
+#, c-format
+msgid "The extension ‘%s’ was not found in filename ‘%s’"
+msgstr "Fant ikke utvidelsen «%s» i filnavnet «%s»"
-#: ../src/prefs.c:1321
-msgid "User Name:"
-msgstr "Brukernavn:"
+#: ../src/scan_dialog.c:557 ../src/scan_dialog.c:588
+#, c-format
+msgid "Cannot find separator ‘%s’ within ‘%s’"
+msgstr "Fant ikke skilletegnet «%s» i «%s»"
-#: ../src/prefs.c:1328
-msgid "Name of user for the the proxy server."
-msgstr "Navn på mellomtjener-brukeren."
+#: ../src/scan_dialog.c:815
+#, c-format
+msgid "Could not convert filename ‘%s’ into system filename encoding"
+msgstr ""
+"Klarte ikke å konvertere filnavnet «%s» til systemets filnavn-tegnkoding"
-#: ../src/prefs.c:1329
-msgid "User Password:"
-msgstr "Passord:"
+#: ../src/scan_dialog.c:840
+msgid "New filename successfully scanned"
+msgstr "Det nye filnavnet er skannet"
-#: ../src/prefs.c:1338
-msgid "Password of user for the proxy server."
-msgstr "Mellomtjener-brukerens passord."
+#: ../src/scan_dialog.c:844
+#, c-format
+msgid "New filename successfully scanned ‘%s’"
+msgstr "Det nye filnavnet «%s» er skannet"
-#. Track Name list (CDDB results)
-#: ../src/prefs.c:1343
-msgid "Track Name List"
-msgstr "Spornavn-liste"
+#: ../src/scan_dialog.c:1214
+#, c-format
+msgid "Error while processing fields ‘%s’"
+msgstr "Det oppstod en feil under behandling av felt «%s»"
-#: ../src/prefs.c:1350
-msgid ""
-"Select corresponding audio file (according position or DLM if activated "
-"below)"
-msgstr ""
-"Velg tilhørende lydfil (samsvarende posisjon, eller DLM hvis det er aktivert "
-"nedenfor)"
+#: ../src/scan_dialog.c:2090
+msgid "New_mask"
+msgstr "New_mask"
-#: ../src/prefs.c:1354
-msgid ""
-"If activated, when selecting a line in the list of tracks name, the "
-"corresponding audio file in the main list will be also selected."
-msgstr ""
-"Hvis dette er slått på, velges relevant(e) lydfil(er) i hovedlista når du "
-"velger en samsvarende linje i lista over spornavn."
+#. The window
+#: ../src/scan_dialog.c:2307
+msgid "Tag and Filename Scan"
+msgstr "Tagg- og filnavnsskanning"
-#. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1359
-msgid ""
-"Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
-"files (using filename)"
-msgstr ""
-"Bruk Levenshtein-algoritmen (DLM) til å koble linjer (ved å bruke tittel) "
-"med lydfiler (ved å bruke filnavnet)"
+#. 'Scan selected files' button
+#: ../src/scan_dialog.c:2313
+msgid "Scan Files"
+msgstr "Skann filer"
-#.
-#. * Confirmation
-#.
-#: ../src/prefs.c:1374
-msgid "Confirmation"
-msgstr "Bekreftelse"
+#: ../src/scan_dialog.c:2319
+msgid "Scan selected files"
+msgstr "Søk gjennom valgte filer"
-#: ../src/prefs.c:1379
-msgid "Confirm exit from program"
-msgstr "Bekreft avslutning av program"
+#: ../src/scan_dialog.c:2957
+msgid "All tags have been scanned"
+msgstr "Alle tagger er blitt gjennomsøkt"
-#: ../src/prefs.c:1382
-msgid ""
-"If activated, opens a dialog box to ask confirmation before exiting the "
-"program."
-msgstr ""
-"Hvis dette er slått på, må brukeren bekrefte at hun vil avslutte programmet."
+#: ../src/search_dialog.c:545
+#, c-format
+msgid "Found one file"
+msgid_plural "Found %d files"
+msgstr[0] "Fant én fil"
+msgstr[1] "Fant %d filer"
-#: ../src/prefs.c:1385
-msgid "Confirm writing of file tag"
-msgstr "Bekreft skriving av filtagg"
+#: ../src/search_dialog.c:594
+msgid "Find Files"
+msgstr "Finn filer"
-#: ../src/prefs.c:1389
-msgid "Confirm renaming of file"
-msgstr "Bekreft endring av filnavn"
+#: ../src/search_dialog.c:678
+msgid "Ready to search…"
+msgstr "Klar til å søke …"
-#: ../src/prefs.c:1393
-msgid "Confirm deleting of file"
-msgstr "Bekreft sletting av fil"
+#: ../src/setting.c:245
+#, c-format
+msgid "Cannot write list to file ‘%s’: %s"
+msgstr "Klarte ikke å lagre liste i filen «%s». %s"
-#: ../src/prefs.c:1397
-msgid "Confirm writing of playlist"
-msgstr "Bekreft skriving av spilleliste"
+#. Fall back to defaults.
+#: ../src/setting.c:350
+msgid "Loading default ‘Fill Tag’ masks…"
+msgstr "Laster inn standard «Fyll ut tagg»-masker …"
-#: ../src/prefs.c:1401
-msgid "Confirm changing directory when there are unsaved changes"
-msgstr "Bekreft mappebytte når endringer ikke er lagret"
+#. Fall back to defaults.
+#: ../src/setting.c:380
+msgid "Loading default ‘Rename File’ masks…"
+msgstr "Laster inn standard «Gi nytt navn til fil»-masker …"
-#. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1439
-#, c-format
-msgid "(Example: %.*d_-_Track_name_1.mp3)"
-msgstr "(Eksempel: %.*d_-_Spornavn_1.mp3)"
+#: ../src/status_bar.c:146
+msgid "Ready to start"
+msgstr "Klar til å begynne"
-#. Translators: please do NOT translate '%.*d' in this string.
-#: ../src/prefs.c:1472
+#: ../src/tag_area.c:186
#, c-format
-msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
-msgstr "(Eksempel: plate_%.*d_av_10/Spornavn_1.mp3)"
+msgid "Selected files tagged with title ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som tittel"
-#: ../src/prefs.c:1614 ../src/setting.c:904
-msgid "Configuration saved"
-msgstr "Oppsettet er lagret"
+#: ../src/tag_area.c:191
+msgid "Removed title from selected files"
+msgstr "Fjernet tittel fra valgte filer"
-#: ../src/prefs.c:1622
-msgid "Configuration unchanged"
-msgstr "Oppsettet er uendret"
+#: ../src/tag_area.c:208
+#, c-format
+msgid "Selected files tagged with artist ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som artist"
-#: ../src/prefs.c:1713
-msgid "The selected path for 'Default path to files' is invalid"
-msgstr "Valgt sti for «Standardsti til filer» er ugyldig"
+#: ../src/tag_area.c:213
+msgid "Removed artist from selected files"
+msgstr "Fjernet artist fra valgte filer"
-#: ../src/prefs.c:1715
+#: ../src/tag_area.c:229
#, c-format
-msgid ""
-"Path: '%s'\n"
-"Error: %s"
-msgstr ""
-"Sti: «%s»\n"
-"Feil: %s"
+msgid "Selected files tagged with album artist ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som albumartist"
-#: ../src/prefs.c:1717
-msgid "Invalid Path Error"
-msgstr "Ugyldig sti-feil"
+#: ../src/tag_area.c:234
+msgid "Removed album artist from selected files"
+msgstr "Fjernet albumartist fra valgte filer"
-#: ../src/prefs.c:1831
+#: ../src/tag_area.c:251
#, c-format
-msgid "The audio file player '%s' cannot be found"
-msgstr "Fant ikke lydavspilleren «%s»"
+msgid "Selected files tagged with album ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som album"
-#: ../src/prefs.c:1833
-msgid "Audio Player Error"
-msgstr "Feil i lydavspiller"
+#: ../src/tag_area.c:256
+msgid "Removed album name from selected files"
+msgstr "Fjernet albumnavn fra valgte filer"
-#: ../src/scan_dialog.c:182
-msgid "Fill Tag"
-msgstr "Fyll ut tagg"
+#: ../src/tag_area.c:294
+#, c-format
+msgid "Selected files tagged with disc number ‘%s/%s’"
+msgstr "Valgte filer er tagget med «%s/%s» som platenummer"
-#: ../src/scan_dialog.c:356
+#: ../src/tag_area.c:299
#, c-format
-msgid "Cannot calculate CRC value of file (%s)"
-msgstr "Klarte ikke å regne ut CRC-verdi av fila (%s)"
+msgid "Selected files tagged with disc number like ‘xx’"
+msgstr "Valgte filer er tagget med platenummer som «xx»"
-#: ../src/scan_dialog.c:371
-msgid "Tag successfully scanned"
-msgstr "Taggen ble skannet"
+#: ../src/tag_area.c:304
+msgid "Removed disc number from selected files"
+msgstr "Fjernet platenummer fra valgte filer"
-#: ../src/scan_dialog.c:373
+#: ../src/tag_area.c:321
#, c-format
-msgid "Tag successfully scanned: %s"
-msgstr "Taggen «%s» ble skannet"
+msgid "Selected files tagged with year ‘%s’"
+msgstr "Valgte filer er tagget med år «%s»"
-#: ../src/scan_dialog.c:414
+#: ../src/tag_area.c:326
+msgid "Removed year from selected files"
+msgstr "Fjernet år fra valgte filer"
+
+#: ../src/tag_area.c:356 ../src/tag_area.c:450
#, c-format
-msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
-msgstr ""
-"Tagg-skanner: dette er snodig, men utvidelsen «%s» ble ikke funnet i "
-"filnavnet «%s»"
+msgid "Selected files tagged with track like ‘xx/%s’"
+msgstr "Valgte filer er tagget med spornummer i form av «xx/%s»"
-#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
+#: ../src/tag_area.c:360
#, c-format
-msgid "Scan Error: can't find separator '%s' within '%s'"
-msgstr "Skannefeil: finner ikke skilletegnet «%s» i «%s»"
+msgid "Selected files tagged with track like ‘xx’"
+msgstr "Valgte filer er tagget med spornummer som «xx»"
-#: ../src/scan_dialog.c:712
-msgid "New filename successfully scanned"
-msgstr "Det nye filnavnet er skannet"
+#: ../src/tag_area.c:365 ../src/tag_area.c:455
+msgid "Removed track number from selected files"
+msgstr "Fjernet spornummer fra valgte filer"
-#: ../src/scan_dialog.c:715
+#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
+#: ../src/tag_area.c:423
#, c-format
-msgid "New filename successfully scanned: %s"
-msgstr "Det nye filnavnet «%s» er skannet"
+msgid "Selected tracks numbered sequentially"
+msgstr "Valgte spor er nummerert i rekkefølge"
-#: ../src/scan_dialog.c:1632
+#: ../src/tag_area.c:472
#, c-format
-msgid "Error while processing fields: %s"
-msgstr "Det oppstod en feil ved behandling av felter: %s"
-
-#. The window
-#: ../src/scan_dialog.c:1802
-msgid "Tag and Filename Scan"
-msgstr "Tagg- og filnavnsskanning"
+msgid "Selected files tagged with genre ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som sjanger"
-#. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan_dialog.c:1811
-msgid "Scan Files"
-msgstr "Skann filer"
+#: ../src/tag_area.c:477
+msgid "Removed genre from selected files"
+msgstr "Fjernet sjanger fra valgte filer"
-#. Option Menu
-#: ../src/scan_dialog.c:1839
-msgid "Scanner:"
-msgstr "Skanner:"
+#: ../src/tag_area.c:501
+#, c-format
+msgid "Selected files tagged with comment ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som kommentar"
-#: ../src/scan_dialog.c:1860
-msgid "Select the type of scanner to use"
-msgstr "Velg hva slags skanner som skal brukes"
+#: ../src/tag_area.c:506
+msgid "Removed comment from selected files"
+msgstr "Fjernet kommentarer fra valgte filer"
-#: ../src/scan_dialog.c:1869
-msgid "Scanner Preferences"
-msgstr "Skannerinnstillinger"
+#: ../src/tag_area.c:522
+#, c-format
+msgid "Selected files tagged with composer ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som komponist"
-#: ../src/scan_dialog.c:1878
-msgid "Show / Hide Masks Editor"
-msgstr "Vis/skjul maskebehandler"
+#: ../src/tag_area.c:527
+msgid "Removed composer from selected files"
+msgstr "Fjernet komponist fra valgte filer"
-#: ../src/scan_dialog.c:1888
-msgid "Show / Hide Legend"
-msgstr "Vis/skjul forklaring"
+#: ../src/tag_area.c:544
+#, c-format
+msgid "Selected files tagged with original artist ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som opprinnelig artist"
-#: ../src/scan_dialog.c:1918
-msgid ""
-"Select or type in a mask using codes (see Legend) to parse filename and "
-"path. Used to fill in tag fields"
-msgstr ""
-"Velg eller skriv inn en maske som bruker koder (se forklaring) til å tolke "
-"filnavn og sti. Brukes til å fylle ut taggfelt"
+#: ../src/tag_area.c:549
+msgid "Removed original artist from selected files"
+msgstr "Fjernet opprinnelig artist fra valgte filer"
-#. Preview label
-#: ../src/scan_dialog.c:1942
-msgid "Fill tag preview"
-msgstr "Forhåndsvis utfylling av tagg"
+#: ../src/tag_area.c:566
+#, c-format
+msgid "Selected files tagged with copyright ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som opphavsrettsmerknad"
-#: ../src/scan_dialog.c:1972
-msgid "Prefix mask with current path"
-msgstr "Bruk gjeldende sti som prefiks i maska"
+#: ../src/tag_area.c:571
+msgid "Removed copyright from selected files"
+msgstr "Fjernet opphavsrettsinfo fra valgte filer"
-#: ../src/scan_dialog.c:1986
-msgid ""
-"Select or type in a mask using codes (see Legend) to parse tag fields. Used "
-"to rename the file.\n"
-"Use / to make directories. If the first character is /, it's a absolute "
-"path, otherwise is relative to the old path."
-msgstr ""
-"Velg eller skriv inn en maske som bruker koder (se forklaring) til å tolke "
-"taggfelt. Brukes til å gi fila nytt navn.\n"
-"Bruk «/» for å lage mapper. Hvis første tegn i stien er «/», så er det en "
-"absolutt sti. Ellers er stien relativ til opprinnelig mappe."
+#: ../src/tag_area.c:588
+#, c-format
+msgid "Selected files tagged with URL ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som nettadresse"
-#. Preview label
-#: ../src/scan_dialog.c:2011
-msgid "Rename file preview"
-msgstr "Forhåndsvisning av nytt filnavn"
+#: ../src/tag_area.c:593
+msgid "Removed URL from selected files"
+msgstr "Fjernet nettadresse fra valgte filer"
-#: ../src/scan_dialog.c:2030
-msgid "Select fields:"
-msgstr "Velg felter:"
+#: ../src/tag_area.c:610
+#, c-format
+msgid "Selected files tagged with encoder name ‘%s’"
+msgstr "Valgte filer er tagget med «%s» som kodeprogram"
-#: ../src/scan_dialog.c:2033
-msgid ""
-"The buttons on the right represent the fields which can be processed. Select "
-"those which interest you"
-msgstr ""
-"Knappene til høyre viser feltene som kan behandles. Velg de du er "
-"interessert i"
+#: ../src/tag_area.c:615
+msgid "Removed encoder name from selected files"
+msgstr "Fjernet kodeprogram-felt fra valgte filer"
-#. Advice for Translators: set the first letter of filename translated
-#: ../src/scan_dialog.c:2037
-msgid "F"
-msgstr "F"
+#: ../src/tag_area.c:650
+msgid "Selected files tagged with images"
+msgstr "Valgte filer er tagget med bilder"
-#: ../src/scan_dialog.c:2039
-msgid "Process filename field"
-msgstr "Behandle filnavn-felt"
+#: ../src/tag_area.c:654
+msgid "Removed images from selected files"
+msgstr "Fjernet bilder fra valgte filer"
-#. Advice for Translators: set the first letter of title translated
-#: ../src/scan_dialog.c:2041
-msgid "T"
-msgstr "T"
+#. Menu items
+#: ../src/tag_area.c:823
+msgid "Tag selected files with this field"
+msgstr "Tagg valgte filer med dette feltet"
-#: ../src/scan_dialog.c:2042
-msgid "Process title field"
-msgstr "Behandle tittelfelt"
+#: ../src/tag_area.c:850
+msgid "All uppercase"
+msgstr "Bare store bokstaver"
-#. Advice for Translators: set the first letter of artist translated
-#: ../src/scan_dialog.c:2044
-msgid "Ar"
-msgstr "Ar"
+#: ../src/tag_area.c:856
+msgid "All lowercase"
+msgstr "Bare små bokstaver"
-#: ../src/scan_dialog.c:2045
-msgid "Process file artist field"
-msgstr "Behandle filartist-felt"
+#: ../src/tag_area.c:862
+msgid "First letter uppercase"
+msgstr "Stor forbokstav"
-#. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan_dialog.c:2047
-msgid "AA"
-msgstr "AA"
+#: ../src/tag_area.c:868
+msgid "First letter uppercase of each word"
+msgstr "Stor forbokstav i hvert ord"
-#: ../src/scan_dialog.c:2048
-msgid "Process album artist field"
-msgstr "Behandle albumartist-felt"
+#: ../src/tag_area.c:884
+msgid "Insert space before uppercase letter"
+msgstr "Sett inn mellomrom før stor bokstav"
-#. Advice for Translators: set the first letter of album translated
-#: ../src/scan_dialog.c:2050
-msgid "Al"
-msgstr "Al"
+#: ../src/tag_area.c:890
+msgid "Remove duplicate spaces or underscores"
+msgstr "Fjern doble mellomrom eller understreker"
-#: ../src/scan_dialog.c:2051
-msgid "Process album field"
-msgstr "Behandle album-felt"
+#: ../src/tag_area.c:896
+msgid "Remove all text"
+msgstr "Fjern all tekst"
-#. Advice for Translators: set the first letter of genre translated
-#: ../src/scan_dialog.c:2053
-msgid "G"
-msgstr "S"
+#: ../src/tag_area.c:1258 ../src/tag_area.c:1336
+#, c-format
+msgid "Error parsing image data ‘%s’"
+msgstr "Feil ved tolkning av bildedata «%s»"
-#: ../src/scan_dialog.c:2054
-msgid "Process genre field"
-msgstr "Behandle sjanger-felt"
+#: ../src/tag_area.c:1318
+msgid ""
+"Cannot display the image because not enough data has been read to determine "
+"how to create the image buffer"
+msgstr ""
+"Klarte ikke å vise bildet. Programmet må lese ytterligere data for å vite "
+"hvordan bilde-mellomlager skal opprettes"
-#. Advice for Translators: set the first letter of comment translated
-#: ../src/scan_dialog.c:2056
-msgid "Cm"
-msgstr "K"
+#: ../src/tag_area.c:1325
+msgid "Cannot display the image"
+msgstr "Klarte ikke å vise bildet"
-#: ../src/scan_dialog.c:2057
-msgid "Process comment field"
-msgstr "Behandle kommentarfelt"
+#: ../src/tag_area.c:1327
+msgid ""
+"Not enough data has been read to determine how to create the image buffer."
+msgstr ""
+"Det har ikke blitt lest nok data til å kunne avgjøre hvordan bilde-"
+"mellomlageret skal opprettes."
-#. Advice for Translators: set the first letter of composer translated
-#: ../src/scan_dialog.c:2059
-msgid "Cp"
-msgstr "K"
+#: ../src/tag_area.c:1329
+msgid "Load Image File"
+msgstr "Last inn bildefil"
-#: ../src/scan_dialog.c:2060
-msgid "Process composer field"
-msgstr "Behandle komponist-felt"
+#: ../src/tag_area.c:1373 ../src/tag_area.c:1398
+#, c-format
+msgid "Image file not loaded ‘%s’"
+msgstr "Bildefila «%s» ble ikke lastet inn"
-#. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan_dialog.c:2062
-msgid "O"
-msgstr "O"
+#: ../src/tag_area.c:1390
+#, c-format
+msgid "Cannot open file ‘%s’"
+msgstr "Klarte ikke å åpne filen «%s»"
-#: ../src/scan_dialog.c:2063
-msgid "Process original artist field"
-msgstr "Behandle opprinnelig artist-felt"
+#: ../src/tag_area.c:1394
+msgid "Image File Error"
+msgstr "Feil med bildefil"
-#. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan_dialog.c:2065
-msgid "Cr"
-msgstr "O"
+#: ../src/tag_area.c:1405
+msgid "Image file loaded"
+msgstr "Bildefil er lastet inn"
-#: ../src/scan_dialog.c:2066
-msgid "Process copyright field"
-msgstr "Behandle opphavsrett-felt"
+#: ../src/tag_area.c:1485
+msgid "Add Images"
+msgstr "Legg til bilder"
-#. Advice for Translators: set the first letter of URL translated
-#: ../src/scan_dialog.c:2068
-msgid "U"
-msgstr "N"
+#: ../src/tag_area.c:1495 ../src/tag_area.c:1847
+msgid "All Files"
+msgstr "Alle filer"
-#: ../src/scan_dialog.c:2069
-msgid "Process URL field"
-msgstr "Behandle nettadresse-felt"
+#: ../src/tag_area.c:1502 ../src/tag_area.c:1854
+msgid "PNG and JPEG"
+msgstr "PNG og JPEG"
-#. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan_dialog.c:2071
-msgid "E"
-msgstr "K"
+#: ../src/tag_area.c:1641
+#, c-format
+msgid "Image Properties %d/%d"
+msgstr "Bildeegenskaper %d/%d"
-#: ../src/scan_dialog.c:2072
-msgid "Process encoder name field"
-msgstr "Behandle kodeprogram-felt"
+#: ../src/tag_area.c:1833
+#, c-format
+msgid "Save Image %d/%d"
+msgstr "Lagre bilde %d/%d"
-#: ../src/scan_dialog.c:2116
-msgid "Invert selection"
-msgstr "Inverter utvalg"
+#: ../src/tag_area.c:1913
+#, c-format
+msgid "Image file not saved ‘%s’"
+msgstr "Bildefila «%s» ble ikke lagret"
-#: ../src/scan_dialog.c:2123
-msgid "Select/Unselect all"
-msgstr "Velg alt/fjern utvalg"
+#: ../src/tag_area.c:2259
+msgid "Tag selected files with this genre"
+msgstr "Tagg valgte filer med denne sjangeren"
-#: ../src/scan_dialog.c:2138
-msgid "Convert:"
-msgstr "Konverter:"
+#: ../src/tag_area.c:2986
+msgid "ID3 Tag"
+msgstr "ID3-tagg"
-#: ../src/scan_dialog.c:2140
-msgid "to: "
-msgstr "til:"
+#: ../src/tag_area.c:2991
+msgid "Ogg Vorbis Tag"
+msgstr "Ogg Vorbis-tagg"
-#: ../src/scan_dialog.c:2147
-msgid "Do not convert"
-msgstr "Ikke konverter"
+#: ../src/tag_area.c:2996
+msgid "FLAC Vorbis Tag"
+msgstr "FLAC Vorbis-tagg"
-#: ../src/scan_dialog.c:2177
-msgid ""
-"The underscore character or the string '%20' are replaced by one space. "
-"Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
-msgstr ""
-"Understrek-tegnet eller strengen «%20» erstattes med enkelt mellomrom. For "
-"eksempel blir «Tekst%20i%20en_oppføring» endret til «Tekst i en oppføring»."
+#: ../src/tag_area.c:3000
+msgid "APE Tag"
+msgstr "APE-tagg"
-#: ../src/scan_dialog.c:2180
-msgid ""
-"The space character is replaced by one underscore character. Example, "
-"before: 'Text In An Entry', after: 'Text_In_An_Entry'."
-msgstr ""
-"Mellomrom-tegnet erstattes av understrek-tegn. For eksempel endres «Tekst i "
-"en oppføring» til «Tekst_i_en_oppføring»."
+#: ../src/tag_area.c:3004
+msgid "MP4/M4A/AAC Tag"
+msgstr "MP4-/M4A-/AAC-tagg"
-#: ../src/scan_dialog.c:2183
-msgid ""
-"Replace a string by another one. Note that the search is case sensitive."
-msgstr ""
-"Erstatt en streng med en annen. Merk at søket skiller mellom små og store "
-"bokstaver."
+#: ../src/tag_area.c:3009
+msgid "Wavpack Tag"
+msgstr "Wavpack-tagg"
-#: ../src/scan_dialog.c:2190
-msgid "Capitalize all"
-msgstr "Bare store bokstaver"
+#: ../src/tag_area.c:3014
+msgid "Opus Tag"
+msgstr "Opus-tagg"
-#: ../src/scan_dialog.c:2192
-msgid "Lowercase all"
-msgstr "Gjør alle bokstaver små"
+#: ../src/tag_area.c:3254
+#, c-format
+msgid "Images (%u)"
+msgstr "Bilder (%u)"
-#: ../src/scan_dialog.c:2194
-msgid "Capitalize first letter"
-msgstr "Gjør første bokstav til stor bokstav"
+#: ../src/tags/ape_tag.c:63 ../src/tags/mp4_header.cc:58
+#: ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:72
+#: ../src/tags/mp4_tag.cc:85 ../src/tags/mp4_tag.cc:91
+#: ../src/tags/ogg_header.c:227
+#, c-format
+msgid "Error while opening file: %s"
+msgstr "Det oppstod en feil under åpning av «%s»"
-#: ../src/scan_dialog.c:2196
-msgid "Capitalize the first letter of each word"
-msgstr "Gjør første bokstav i hvert ord til stor bokstav"
+#: ../src/tags/ape_tag.c:385
+msgid "Failed to write APE tag"
+msgstr "Klarte ikke å lagre APE-tagg"
-#: ../src/scan_dialog.c:2197
-msgid "Detect Roman numerals"
-msgstr "Oppdag romerske numre"
+#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:116
+msgid "Error opening FLAC file"
+msgstr "Det oppstod en feil under åpning av FLAC-fil"
-#: ../src/scan_dialog.c:2199
-msgid "Do not change capitalization"
-msgstr "Ikke endre små og store bokstaver"
+#: ../src/tags/flac_header.c:165
+msgid "FLAC File"
+msgstr "FLAC-fil"
-#: ../src/scan_dialog.c:2236
-msgid ""
-"Convert all words in all fields to upper case. Example, before: 'Text IN AN "
-"entry', after: 'TEXT IN AN ENTRY'."
-msgstr ""
-"Endre alle ord i alle felt til store bokstaver. For eksempel blir «Tekst I "
-"EN oppføring» endret til «TEKST I EN OPPFØRING»."
+#. Mode
+#. Mode
+#. mpeg4ip library seems to always return -1
+#. Mode
+#: ../src/tags/flac_header.c:178 ../src/tags/mp4_header.cc:152
+#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:236
+#: ../src/tags/wavpack_header.c:151
+msgid "Channels:"
+msgstr "Kanaler:"
-#: ../src/scan_dialog.c:2239
-msgid ""
-"Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
-"entry', after: 'text in an entry'."
-msgstr ""
-"Endre alle ord i alle felt til små bokstaver. For eksempel blir «TEKST I en "
-"oppføring» endret til «tekst i en oppføring»."
+#: ../src/tags/flac_tag.c:815 ../src/tags/flac_tag.c:848
+#: ../src/tags/flac_tag.c:862
+#, c-format
+msgid "Error while opening file ‘%s’ as FLAC: %s"
+msgstr "Det oppstod en feil under åpning av «%s» som FLAC. %s"
-#: ../src/scan_dialog.c:2242
-msgid ""
-"Convert the initial of the first word in all fields to upper case. Example, "
-"before: 'text IN An ENTRY', after: 'Text in an entry'."
-msgstr ""
-"Endre første bokstav i første ord i alle felter til store bokstaver. For "
-"eksempel blir «tekst I en OPPFØRING» endret til «Tekst i en oppføring»."
+#: ../src/tags/flac_tag.c:1144 ../src/tags/flac_tag.c:1156
+#: ../src/tags/flac_tag.c:1176
+#, c-format
+msgid "Failed to write comments to file ‘%s’: %s"
+msgstr "Klarte ikke å lagre kommentarer i «%s». %s"
-#: ../src/scan_dialog.c:2245
+#: ../src/tags/id3_tag.c:209
+#, c-format
msgid ""
-"Convert the initial of each word in all fields to upper case. Example, "
-"before: 'Text in an ENTRY', after: 'Text In An Entry'."
+"As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
+"not be processed"
msgstr ""
-"Endre første bokstav i hvert ord i alle felter til store bokstaver. For "
-"eksempel blir «Tekst i en OPPFØRING» endret til «Tekst I En Oppføring»."
+"filen «%s» er korrupt, og ville ha forårsaket en feil i id3lib. Den blir "
+"derfor ikke behandlet"
-#: ../src/scan_dialog.c:2248
-msgid ""
-"Force to convert to upper case the Roman numerals. Example, before: 'ix. "
-"text in an entry', after: 'IX. Text In An Entry'."
-msgstr ""
-"Tving endring av romerske numre til store bokstaver. For eksempel blir «ix. "
-"tekst i en oppføring» endret til «IX. Tekst I En Oppføring»."
+#: ../src/tags/id3_tag.c:211
+msgid "Corrupted file"
+msgstr "Korrupt fil"
-#: ../src/scan_dialog.c:2256
-msgid "Insert a space before uppercase letters"
-msgstr "Sett inn mellomrom før store bokstaver"
+#: ../src/tags/id3_tag.c:600
+#, c-format
+msgid "Removed tag of ‘%s’"
+msgstr "Fjernet tagg fra «%s»"
-#: ../src/scan_dialog.c:2258
-msgid "Remove duplicate spaces and underscores"
-msgstr "Fjern doble mellomrom og understreker"
+#: ../src/tags/id3_tag.c:607 ../src/tags/id3_tag.c:737
+#, c-format
+msgid "Error while removing ID3v1 tag of ‘%s’: %s"
+msgstr "Det oppstod en feil under fjerning av ID3v1-tagg fra «%s». %s"
-#: ../src/scan_dialog.c:2260
-msgid "Do not change word separators"
-msgstr "Ikke endre orddelere"
+#: ../src/tags/id3_tag.c:616 ../src/tags/id3_tag.c:700
+#, c-format
+msgid "Error while removing ID3v2 tag of ‘%s’: %s"
+msgstr "Det oppstod en feil under fjerning av ID3v2-tagg fra «%s». %s"
-#: ../src/scan_dialog.c:2282
-msgid ""
-"All spaces between words are removed. Example, before: 'Text In An Entry', "
-"after: 'TextInAnEntry'."
-msgstr ""
-"Alle mellomrom mellom ord blir fjernet. For eksempel blir «Tekst I En "
-"Oppføring» endret til «TekstIEnOppføring»."
+#: ../src/tags/id3_tag.c:642
+#, c-format
+msgid "Error while updating ID3v2 tag of ‘%s’: %s"
+msgstr "Det oppstod en feil under oppdatering av ID3v2-tagg for «%s». %s"
-#: ../src/scan_dialog.c:2285
+#: ../src/tags/id3_tag.c:674
msgid ""
-"A space is inserted before each upper case letter. Example, before: "
-"'TextInAnEntry', after: 'Text In An Entry'."
+"You have tried to save this tag to Unicode but it was detected that your "
+"version of id3lib is buggy"
msgstr ""
-"Det settes inn et mellomrom før hver store bokstav. For eksempel blir "
-"«TekstIEnOppføring» gjort om til «Tekst I En Oppføring»."
+"Du har prøvd å lagre denne taggen i Unicode-format, men versjonen du bruker "
+"av id3lib inneholder feil"
-#: ../src/scan_dialog.c:2288
+#: ../src/tags/id3_tag.c:676
+#, c-format
msgid ""
-"Duplicate spaces and underscores are removed. Example, before: "
-"'Text__In__An Entry', after: 'Text_In_An Entry'."
+"If you reload this file, some characters in the tag may not be displayed "
+"correctly. Please, apply the patch src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which is available in "
+"the EasyTAG package sources.\n"
+"Note that this message will appear only once.\n"
+"\n"
+"File: %s"
msgstr ""
-"Doble mellomrom og understreker fjernes. For eksempel blir «Tekst__I__En "
-"Oppføring» endret til «Tekst_I_En Oppføring»."
+"Hvis du laster inn denne filen på nytt, kan det hende at enkelte tegn i "
+"taggen ikke vises korrekt. Bruk programfikset src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff på id3lib, som er tilgjengelig i "
+"EasyTAGs pakkekilder.\n"
+"Denne meldinga vises bare én gang.\n"
+"\n"
+"Fil: %s"
-#.
-#. * Frame to display codes legend
-#.
-#: ../src/scan_dialog.c:2295
-msgid "Legend"
-msgstr "Forklaring"
+#: ../src/tags/id3_tag.c:683
+msgid "Buggy id3lib"
+msgstr "id3lib inneholder feil"
-#: ../src/scan_dialog.c:2301
+#: ../src/tags/id3_tag.c:725
#, c-format
-msgid "%a: artist"
-msgstr "%a: artist"
+msgid "Error while updating ID3v1 tag of ‘%s’: %s"
+msgstr "Det oppstod en feil under oppdatering av ID3v1-tagg for «%s». %s"
-#: ../src/scan_dialog.c:2304
-msgid "%z: album artist"
-msgstr "%z: albumartist"
+#: ../src/tags/id3_tag.c:759
+msgid "No error reported"
+msgstr "Ingen feil er rapportert"
-#: ../src/scan_dialog.c:2307
-msgid "%b: album"
-msgstr "%b: album"
+#: ../src/tags/id3_tag.c:761
+msgid "No available memory"
+msgstr "Intet minne tilgjengelig"
-#: ../src/scan_dialog.c:2310
-#, c-format
-msgid "%c: comment"
-msgstr "%c: kommentar"
+#: ../src/tags/id3_tag.c:763
+msgid "No data to parse"
+msgstr "Ingen data å lese"
-#: ../src/scan_dialog.c:2313
-#, c-format
-msgid "%p: composer"
-msgstr "%p: komponist"
+#: ../src/tags/id3_tag.c:765
+msgid "Improperly formatted data"
+msgstr "Feilformaterte data"
-#: ../src/scan_dialog.c:2316
-msgid "%r: copyright"
-msgstr "%r: opphavsrett"
+#: ../src/tags/id3_tag.c:767
+msgid "No buffer to write to"
+msgstr "Intet mellomlager å skrive til"
-#: ../src/scan_dialog.c:2319
-#, c-format
-msgid "%d: disc number"
-msgstr "%d: platenummer"
+#: ../src/tags/id3_tag.c:769
+msgid "Buffer is too small"
+msgstr "Mellomlageret er for lite"
-#: ../src/scan_dialog.c:2322
-#, c-format
-msgid "%e: encoded by"
-msgstr "%e: kodet av"
+#: ../src/tags/id3_tag.c:771
+msgid "Invalid frame ID"
+msgstr "Ugyldig ramme-ID"
-#: ../src/scan_dialog.c:2325
-#, c-format
-msgid "%g: genre"
-msgstr "%g: sjanger"
+#: ../src/tags/id3_tag.c:773
+msgid "Requested field not found"
+msgstr "Fant ikke etterspurt felt"
-#: ../src/scan_dialog.c:2328
-#, c-format
-msgid "%i: ignored"
-msgstr "%i: ignorert"
+#: ../src/tags/id3_tag.c:775
+msgid "Unknown field type"
+msgstr "Ukjent felttype"
-#: ../src/scan_dialog.c:2331
-msgid "%l: number of tracks"
-msgstr "%l: antall spor"
+#: ../src/tags/id3_tag.c:777
+msgid "Tag is already attached to a file"
+msgstr "Taggen er allerede festet til en fil"
-#: ../src/scan_dialog.c:2334
-#, c-format
-msgid "%o: orig. artist"
-msgstr "%o: oppr. artist"
+#: ../src/tags/id3_tag.c:779
+msgid "Invalid tag version"
+msgstr "Ugyldig taggversjon"
-#: ../src/scan_dialog.c:2337
-#, c-format
-msgid "%n: track"
-msgstr "%n: spornummer"
+#: ../src/tags/id3_tag.c:781
+msgid "No file to parse"
+msgstr "Ingen fil å lese"
-#: ../src/scan_dialog.c:2340
-msgid "%t: title"
-msgstr "%t: tittel"
+#: ../src/tags/id3_tag.c:783
+msgid "Attempting to write to a read-only file"
+msgstr "Prøver å skrive til en skrivebeskyttet fil"
-#: ../src/scan_dialog.c:2343
-#, c-format
-msgid "%u: URL"
-msgstr "%u: nettadresse"
+#: ../src/tags/id3_tag.c:785
+msgid "Error in compression/uncompression"
+msgstr "Feil under komprimering/utpakking"
-#: ../src/scan_dialog.c:2346
-#, c-format
-msgid "%x: number of discs"
-msgstr "%x: antall plater"
+#: ../src/tags/id3_tag.c:787
+msgid "Unknown error message"
+msgstr "Ukjent feilmelding"
-#: ../src/scan_dialog.c:2349
-msgid "%y: year"
-msgstr "%y: år"
+#: ../src/tags/id3_tag.c:1474
+msgid "Error while creating temporary file"
+msgstr "Det oppstod en feil under opprettelse av midlertidig fil"
-#.
-#. * Masks Editor
-#.
-#: ../src/scan_dialog.c:2356
-msgid "Mask Editor"
-msgstr "Maskebehandler"
+#: ../src/tags/id3v24_tag.c:132 ../src/tags/id3v24_tag.c:187
+#: ../src/tags/id3v24_tag.c:225 ../src/tags/id3v24_tag.c:236
+#: ../src/tags/id3v24_tag.c:952 ../src/tags/id3v24_tag.c:959
+#: ../src/tags/id3v24_tag.c:985 ../src/tags/id3v24_tag.c:1025
+#: ../src/tags/mp4_tag.cc:101 ../src/tags/ogg_header.c:277
+msgid "Error reading tags from file"
+msgstr "Det oppstod en feil under lesing av tagger fra fil"
-#: ../src/scan_dialog.c:2410
-msgid "Create New Mask"
-msgstr "Lag ny maske"
+#: ../src/tags/monkeyaudio_header.c:46
+msgid "Error opening Monkey’s Audio file"
+msgstr "Det oppstod en feil under åpning av en Monkey's Audio-fil"
-#: ../src/scan_dialog.c:2420
-msgid "Move Up this Mask"
-msgstr "Flytt denne maska opp"
+#. Mode changed to profile name
+#: ../src/tags/monkeyaudio_header.c:78 ../src/tags/musepack_header.c:81
+msgid "Profile:"
+msgstr "Profil:"
-#: ../src/scan_dialog.c:2430
-msgid "Move Down this Mask"
-msgstr "Flytt denne maska ned"
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:92
+#: ../src/tags/mp4_tag.cc:288
+msgid "MP4 format invalid"
+msgstr "Ugyldig MP4-format"
-#: ../src/scan_dialog.c:2440
-msgid "Duplicate Mask"
-msgstr "Dupliser maske"
+#: ../src/tags/mp4_header.cc:77
+msgid "Error reading properties from file"
+msgstr "Det oppstod en feil under lesing av egenskaper for fil"
-#: ../src/scan_dialog.c:2450
-msgid "Add Default Masks"
-msgstr "Legg til standardmasker"
+#: ../src/tags/mp4_header.cc:131
+msgid "MP4/AAC File"
+msgstr "MP4-/AAC-fil"
-#: ../src/scan_dialog.c:2460
-msgid "Remove Mask"
-msgstr "Fjern maske"
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:248
+#, c-format
+msgid "~%d kb/s"
+msgstr "~%d kb/s"
-#: ../src/scan_dialog.c:2470
-msgid "Save Masks"
-msgstr "Lagre masker"
+#: ../src/tags/mp4_tag.cc:265 ../src/tags/mp4_tag.cc:281
+#: ../src/tags/mp4_tag.cc:287
+#, c-format
+msgid "Error while opening file ‘%s’: %s"
+msgstr "Det oppstod en feil under åpning av «%s». %s"
-#: ../src/scan_dialog.c:3050
-msgid "New_mask"
-msgstr "New_mask"
+#: ../src/tags/mp4_tag.cc:298
+#, c-format
+msgid "Error reading tags from file ‘%s’"
+msgstr "Det oppstod en feil under lesing av tagger fra filen «%s»"
+
+#: ../src/tags/mpeg_header.c:51
+msgid "Stereo"
+msgstr "Stereo"
-#: ../src/scan_dialog.c:3089
-msgid "Copy: No row selected"
-msgstr "Feil ved kopiering: Du har ikke valgt noen rad"
+#: ../src/tags/mpeg_header.c:52
+msgid "Joint stereo"
+msgstr "Kombinert stereo"
-#: ../src/scan_dialog.c:3182
-msgid "Remove: No row selected"
-msgstr "Fjern: Ingen rad valgt"
+#: ../src/tags/mpeg_header.c:53
+msgid "Dual channel"
+msgstr "Dobbeltkanal"
-#: ../src/scan_dialog.c:3229
-msgid "Move Up: No row selected"
-msgstr "Flytt opp: Ingen rad er valgt"
+#: ../src/tags/mpeg_header.c:54
+msgid "Single channel"
+msgstr "Én kanal"
-#: ../src/scan_dialog.c:3273
-msgid "Move Down: No row selected"
-msgstr "Flytt ned: Ingen rad er valgt"
+#: ../src/tags/mpeg_header.c:216
+msgid "MP3 File"
+msgstr "MP3-fil"
-#: ../src/setting.c:924
-#, c-format
-msgid "Error: Cannot write configuration file: %s (%s)"
-msgstr "Feil: klarte ikke å skrive oppsettsfila «%s» (%s)"
+#: ../src/tags/mpeg_header.c:220
+msgid "MP2 File"
+msgstr "MP2-fil"
-#: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
-#, c-format
-msgid "Error while writing configuration file: %s"
-msgstr "Det oppstod en feil ved skriving av oppsettsfil. %s"
+#. MPEG, Layer versions
+#: ../src/tags/mpeg_header.c:228
+msgid "MPEG"
+msgstr "MPEG"
-#: ../src/setting.c:1100
-#, c-format
-msgid "Cannot open configuration file '%s' (%s)"
-msgstr "Klarte ikke å åpne oppsettsfila «%s» (%s)"
+#: ../src/tags/musepack_header.c:46
+msgid "Error opening Musepack file"
+msgstr "Det oppstod en feil under åpning av Musepack-fil"
-#: ../src/setting.c:1102
-msgid "Loading default configuration"
-msgstr "Laster inn standardoppsett"
+#: ../src/tags/musepack_header.c:78
+msgid "MusePack File"
+msgstr "MusePack-file"
-#: ../src/setting.c:1143
-#, c-format
-msgid "Cannot create or open file '%s' (%s)"
-msgstr "Klarte ikke å lage eller åpne fila «%s» (%s)"
+#: ../src/tags/ogg_header.c:243
+msgid ""
+"The specified bitstream does not exist or the file has been initialized "
+"improperly"
+msgstr "Valgt bitstrøm finnes ikke, eller filen er lastet inn på feil måte"
-#: ../src/setting.c:1203
-#, c-format
-msgid "Error: Cannot write list to file: %s (%s)"
-msgstr "Feil: klarte ikke å skrive lista til fila «%s» (%s)"
+#: ../src/tags/ogg_header.c:262
+msgid "Read from media returned an error"
+msgstr "Det oppstod en feil under lesing fra medier"
-#: ../src/setting.c:1221
-#, c-format
-msgid "Error while writing list file: %s"
-msgstr "Det oppstod en feil ved skriving av listefil. %s"
+#: ../src/tags/ogg_header.c:265
+msgid "Bitstream is not Vorbis data"
+msgstr "Bitstrøm er ikke Vorbis-data"
-#. Fall back to defaults
-#: ../src/setting.c:1301
-msgid "Loading default 'Fill Tag' masks…"
-msgstr "Laster inn standard «Fyll ut tagg»-masker …"
+#: ../src/tags/ogg_header.c:268
+msgid "Vorbis version mismatch"
+msgstr "Vorbis-versjoner samsvarer ikke"
-#. Fall back to defaults
-#: ../src/setting.c:1331
-msgid "Loading default 'Rename File' masks…"
-msgstr "Laster inn standard «Gi nytt navn til fil»-masker …"
+#: ../src/tags/ogg_header.c:271
+msgid "Invalid Vorbis bitstream header"
+msgstr "Ugyldig Vorbis-bitstrøm-hode"
-#. Fall back to defaults
-#: ../src/setting.c:1357
-msgid "Loading default 'Rename Directory' masks…"
-msgstr "Laster inn standard «Gi nytt navn til mappe»-masker …"
+#: ../src/tags/ogg_header.c:274
+msgid "Internal logic fault, indicates a bug or heap/stack corruption"
+msgstr ""
+"Intern logisk feil. Dette tyder ofte på en programfeil eller ødelagt haug/"
+"stabel"
-#: ../src/setting.c:1568
+#: ../src/tags/ogg_header.c:325
#, c-format
-msgid "Migrating configuration from directory '%s' to '%s'"
-msgstr "Flytter oppsett fra mappa «%s» til «%s»"
+msgid "Failed to open file as Vorbis: %s"
+msgstr "Klarte ikke å åpne filen «%s» som Vorbis"
-#: ../src/setting.c:1592
-#, c-format
-msgid "Failed to migrate configuration file '%s'"
-msgstr "Klarte ikke å flytte oppsettsfila «%s»"
+#: ../src/tags/ogg_header.c:387
+msgid "Ogg Vorbis File"
+msgstr "Ogg Vorbis-fil"
-#: ../src/setting.c:1629
-#, c-format
-msgid "Error: Cannot create directory '%s' (%s)"
-msgstr "Feil: klarte ikke å lage mappa «%s» (%s)"
+#: ../src/tags/ogg_header.c:391
+msgid "Speex File"
+msgstr "Speex-fil"
+
+#: ../src/tags/opus_header.c:223
+msgid "Opus File"
+msgstr "Opus-fil"
-#~ msgid "Cannot write tag in file '%s' (%s)"
-#~ msgstr "Klarte ikke å skrive tagg til fila «%s» (%s)"
+#: ../src/tags/wavpack_header.c:138
+msgid "Wavpack File"
+msgstr "Wavpack-fil"
diff --git a/po/pl.po b/po/pl.po
index f293cf6..02ce147 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,14 +8,14 @@
# Artur Polaczyński <artii at o2.pl>, 2003-2004.
# Tomasz Sałaciński <tsalacinski at gmail.com>, 2007.
# Michał Smoczyk <msmoczyk at wp.pl>, 2007-2012.
-# Piotr Drąg <piotrdrag at gmail.com>, 2012-2014.
-# Aviary.pl <gnomepl at aviary.pl>, 2012-2014.
+# Piotr Drąg <piotrdrag at gmail.com>, 2012-2015.
+# Aviary.pl <gnomepl at aviary.pl>, 2012-2015.
msgid ""
msgstr ""
"Project-Id-Version: easytag\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-30 18:18+0100\n"
-"PO-Revision-Date: 2014-11-30 18:19+0100\n"
+"POT-Creation-Date: 2015-02-22 20:44+0100\n"
+"PO-Revision-Date: 2015-02-22 20:45+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
"Language-Team: Polish <gnomepl at aviary.pl>\n"
"Language: pl\n"
@@ -96,16 +96,16 @@ msgstr ""
"Proszę podać program do uruchomienia, otrzyma on bieżący katalog jako "
"parametr"
-#: ../data/browser.ui.h:4 ../src/browser.c:3775 ../src/tag_area.c:1492
+#: ../data/browser.ui.h:4 ../src/browser.c:3783 ../src/tag_area.c:1518
msgid "_Open"
msgstr "_Otwórz"
#: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
-#: ../src/application_window.c:324 ../src/application_window.c:338
-#: ../src/application_window.c:2686 ../src/application_window.c:2724
-#: ../src/browser.c:865 ../src/browser.c:3774 ../src/cddb_dialog.c:2303
-#: ../src/easytag.c:495 ../src/easytag.c:502 ../src/easytag.c:627
-#: ../src/playlist_dialog.c:655 ../src/tag_area.c:1490 ../src/tag_area.c:1853
+#: ../src/application_window.c:343 ../src/application_window.c:357
+#: ../src/application_window.c:2992 ../src/application_window.c:3030
+#: ../src/browser.c:863 ../src/browser.c:3782 ../src/cddb_dialog.c:2306
+#: ../src/easytag.c:475 ../src/easytag.c:482 ../src/easytag.c:607
+#: ../src/playlist_dialog.c:669 ../src/tag_area.c:1516 ../src/tag_area.c:1868
msgid "_Cancel"
msgstr "_Anuluj"
@@ -124,7 +124,7 @@ msgstr ""
"Proszę podać program do uruchomienia, otrzyma on bieżące pliki jako parametr"
#. Only directories changed
-#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:593
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:573
msgid "Rename Directory"
msgstr "Zmień nazwę katalogu"
@@ -160,11 +160,11 @@ msgstr "_Zmień nazwę"
msgid "Choose a directory to show in the browser"
msgstr "Proszę wybrać katalog do wyświetlenia w przeglądarce"
-#: ../data/browser.ui.h:17 ../src/application.c:129
+#: ../data/browser.ui.h:17 ../src/application.c:130
msgid "Select a directory to browse"
msgstr "Proszę wybrać katalog do przeglądania"
-#: ../data/browser.ui.h:18 ../src/easytag.c:1102
+#: ../data/browser.ui.h:18 ../src/easytag.c:1080
msgid "No files"
msgstr "Brak plików"
@@ -231,7 +231,7 @@ msgstr "Komentarz"
#: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71
#: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
-#: ../src/picture.c:237
+#: ../src/picture.c:214
msgid "Composer"
msgstr "Kompozytor"
@@ -298,7 +298,7 @@ msgid "Track Name"
msgstr "Nazwa ścieżki"
#: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91
-#: ../src/picture.c:215
+#: ../src/picture.c:192
msgid "Other"
msgstr "Inne"
@@ -422,13 +422,13 @@ msgid "Whether to use the DLM algorithm to match CDDB results to files"
msgstr "Czy używać algorytmu DLM do dopasowywania wyników CDDB do plików"
#: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
-#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:295
-#: ../src/scan_dialog.c:2259
+#: ../src/load_files_dialog.c:900 ../src/preferences_dialog.c:291
+#: ../src/scan_dialog.c:2307
msgid "_Close"
msgstr "Za_mknij"
-#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2304
-#: ../src/load_files_dialog.c:896
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2307
+#: ../src/load_files_dialog.c:901
msgid "_Apply"
msgstr "_Zastosuj"
@@ -439,7 +439,8 @@ msgstr ""
"zaznaczono)"
#. Default values are MPEG data.
-#: ../data/file_area.ui.h:1 ../src/et_core.c:3034 ../src/file_area.c:192
+#: ../data/file_area.ui.h:1 ../src/application_window.c:2186
+#: ../src/file_area.c:196
msgid "File"
msgstr "Plik"
@@ -450,10 +451,10 @@ msgstr "0/0:"
#. Nothing to display
#. Version changed to encoder version
#. Encoder version
-#: ../data/file_area.ui.h:3 ../src/file_area.c:193
-#: ../src/tags/flac_header.c:303 ../src/tags/monkeyaudio_header.c:89
-#: ../src/tags/musepack_header.c:93 ../src/tags/ogg_header.c:399
-#: ../src/tags/opus_header.c:225 ../src/tags/wavpack_header.c:86
+#: ../data/file_area.ui.h:3 ../src/file_area.c:197
+#: ../src/tags/flac_header.c:168 ../src/tags/monkeyaudio_header.c:88
+#: ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:399
+#: ../src/tags/opus_header.c:226 ../src/tags/wavpack_header.c:141
msgid "Encoder:"
msgstr "Koder:"
@@ -466,8 +467,8 @@ msgid "Sample rate:"
msgstr "Częstotliwość próbkowania:"
#. Mode
-#: ../data/file_area.ui.h:6 ../src/file_area.c:197
-#: ../src/tags/mpeg_header.c:248
+#: ../data/file_area.ui.h:6 ../src/file_area.c:201
+#: ../src/tags/mpeg_header.c:260
msgid "Mode:"
msgstr "Tryb:"
@@ -507,8 +508,8 @@ msgstr "Wstaw pusty wiersz przed wybranym wierszem"
msgid "Delete the selected line"
msgstr "Usuń zaznaczony wiersz"
-#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:636
-#: ../src/load_files_dialog.c:739
+#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:641
+#: ../src/load_files_dialog.c:744
msgid "Delete all blank lines"
msgstr "Usuń wszystkie puste wiersze"
@@ -520,8 +521,8 @@ msgstr "Przesuń zaznaczony wiersz do góry"
msgid "Move the selected line down"
msgstr "Przesuń zaznaczony wiersz w dół"
-#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:654
-#: ../src/load_files_dialog.c:757
+#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:659
+#: ../src/load_files_dialog.c:762
msgid "Reload"
msgstr "Wczytaj ponownie"
@@ -546,7 +547,7 @@ msgstr "Pomo_c"
msgid "_About"
msgstr "_O programie"
-#: ../data/menus.ui.h:3 ../src/application_window.c:2725
+#: ../data/menus.ui.h:3 ../src/application_window.c:3031
msgid "_Quit"
msgstr "Za_kończ"
@@ -1920,8 +1921,8 @@ msgstr "%o: pierwotny wykonawca"
#: ../data/scan_dialog.ui.h:37
#, no-c-format
-msgid "%n: track"
-msgstr "%n: ścieżka"
+msgid "%n: track number"
+msgstr "%n: numer ścieżki"
#: ../data/scan_dialog.ui.h:39
#, no-c-format
@@ -1969,7 +1970,7 @@ msgid "Rename file preview"
msgstr "Podgląd zmiany nazwy pliku"
#. Only filename changed
-#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:602
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:582
msgid "Rename File"
msgstr "Zmień nazwę pliku"
@@ -2095,7 +2096,7 @@ msgid "Spaces Conversions"
msgstr "Zmiana spacji"
#: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153
-#: ../src/tag_area.c:875
+#: ../src/tag_area.c:906
msgid "Remove spaces"
msgstr "Usuwanie spacji"
@@ -2132,7 +2133,7 @@ msgstr "Bez zmiany separatorów słów"
msgid "Character Conversions"
msgstr "Konwersja znaków"
-#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:831
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:862
#, no-c-format
msgid "Convert ‘_’ and ‘%20’ to spaces"
msgstr "Zmienianie \"_\" i \"%20\" na spacje"
@@ -2146,7 +2147,7 @@ msgstr ""
"Znak podkreślenia oraz ciąg \"%20\" jest zamieniany na jedną spację. "
"Przykład, przed: \"Tekst%20w%20jakimś_polu\", po: \"Tekst w jakimś polu\""
-#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:837
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:868
msgid "Convert spaces to underscores"
msgstr "Zmienianie spacji na \"_\""
@@ -2228,7 +2229,7 @@ msgstr "CD"
msgid "Image Type"
msgstr "Typ obrazu"
-#: ../data/tag_area.ui.h:2 ../src/picture.c:297
+#: ../data/tag_area.ui.h:2 ../src/picture.c:269
msgid "Description"
msgstr "Opis"
@@ -2236,7 +2237,7 @@ msgstr "Opis"
msgid "_Accept"
msgstr "_Zaakceptuj"
-#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3031
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3051
msgid "Tag"
msgstr "Etykieta"
@@ -2392,7 +2393,7 @@ msgstr "Modyfikuje właściwości obrazu"
msgid "Tag selected files with these images"
msgstr "Wstawia te obrazy do zaznaczonych plików"
-#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3284 ../src/tag_area.c:3287
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3304 ../src/tag_area.c:3307
msgid "Images"
msgstr "Obrazy"
@@ -2468,7 +2469,7 @@ msgstr "Wyszukaj nazwy plików i etykiety"
msgid "CDDB Search…"
msgstr "Wyszukaj pliki w CDDB…"
-#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2752
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2756
msgid "CDDB Search"
msgstr "Wyszukiwanie w CDDB"
@@ -3103,214 +3104,262 @@ msgid "Open the selected files in EasyTAG"
msgstr "Otwiera zaznaczone pliki w programie EasyTAG"
#. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:90
+#: ../src/about.c:89
msgid "translator-credits"
msgstr ""
"Maciej Kasprzyk <kapsrzol at o2.pl>, 2002\n"
"Artur Polaczyński <artii at o2.pl>, 2003-2004\n"
"Tomasz Sałaciński <tsalacinski at gmail.com>, 2007\n"
"Michał Smoczyk <msmoczyk at wp.pl>, 2007-2012\n"
-"Piotr Drąg <piotrdrag at gmail.com>, 2012-2014\n"
-"Aviary.pl <gnomepl at aviary.pl>, 2012-2014"
+"Piotr Drąg <piotrdrag at gmail.com>, 2012-2015\n"
+"Aviary.pl <gnomepl at aviary.pl>, 2012-2015"
-#: ../src/about.c:100
+#: ../src/about.c:99
msgid "View and edit tags in audio files"
msgstr "Wyświetlanie i modyfikowanie etykiet w plikach dźwiękowych"
-#: ../src/application.c:46
+#: ../src/application.c:47
msgid "Print the version and exit"
msgstr "Wyświetla wersję i kończy działanie"
#. Starting messages
-#: ../src/application.c:176
+#: ../src/application.c:177
#, c-format
msgid "Starting EasyTAG version %s…"
msgstr "Uruchamianie programu EasyTAG %s…"
-#: ../src/application.c:181
+#: ../src/application.c:182
#, c-format
msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
msgstr "Podano zmienną EASYTAGLANG, stawianie lokalizacji \"%s\""
-#: ../src/application.c:186
+#: ../src/application.c:187
#, c-format
msgid "Setting locale: ‘%s’"
msgstr "Ustawianie lokalizacji: \"%s\""
-#: ../src/application.c:192
+#: ../src/application.c:193
#, c-format
msgid "System locale is ‘%s’, using ‘%s’"
msgstr "Lokalizacja systemu to \"%s\", używanie \"%s\""
-#: ../src/application.c:197
+#: ../src/application.c:198
msgid "Unable to create setting directories"
msgstr "Nie można utworzyć katalogów ustawień"
-#: ../src/application.c:338
+#: ../src/application.c:339
#, c-format
msgid "Website: %s"
msgstr "Witryna: %s"
-#: ../src/application.c:347
+#: ../src/application.c:348
msgid "- Tag and rename audio files"
msgstr "- nadawanie etykiet i zmienianie nazw plikach dźwiękowych"
-#: ../src/application.c:431 ../src/et_core.c:679
+#: ../src/application.c:432 ../src/file_list.c:402
#, c-format
msgid "Error while querying information for file ‘%s’: %s"
msgstr "Błąd podczas odpytywania informacji o pliku \"%s\": %s"
-#: ../src/application.c:495
+#: ../src/application.c:495 ../src/application.c:503
#, c-format
msgid "Cannot open path ‘%s’"
msgstr "Nie można otworzyć ścieżki \"%s\""
-#: ../src/application_window.c:318 ../src/application_window.c:335
+#: ../src/application_window.c:337 ../src/application_window.c:354
#, c-format
msgid "Do you really want to delete the file ‘%s’?"
msgstr "Na pewno usunąć plik \"%s\"?"
-#: ../src/application_window.c:321 ../src/easytag.c:490 ../src/easytag.c:623
+#: ../src/application_window.c:340 ../src/easytag.c:470 ../src/easytag.c:603
msgid "Repeat action for the remaining files"
msgstr "Powtórzenie działania dla pozostałych plików"
-#: ../src/application_window.c:323
+#: ../src/application_window.c:342
msgid "_Skip"
msgstr "_Pomiń"
-#: ../src/application_window.c:325 ../src/application_window.c:339
+#: ../src/application_window.c:344 ../src/application_window.c:358
msgid "_Delete"
msgstr "_Usuń"
-#: ../src/application_window.c:327 ../src/application_window.c:337
+#: ../src/application_window.c:346 ../src/application_window.c:356
msgid "Delete File"
msgstr "Usuń pliki"
-#: ../src/application_window.c:364
+#: ../src/application_window.c:383
#, c-format
msgid "File ‘%s’ deleted"
msgstr "Usunięto plik \"%s\""
-#: ../src/application_window.c:541
+#: ../src/application_window.c:558
#, c-format
msgid "Cannot delete file ‘%s’"
msgstr "Nie można usunąć pliku \"%s\""
-#: ../src/application_window.c:562
+#: ../src/application_window.c:582
msgid "Some files were not deleted"
msgstr "Niektóre pliki nie zostały usunięte"
-#: ../src/application_window.c:564
+#: ../src/application_window.c:584
msgid "All files have been deleted"
msgstr "Wszystkie pliki zostały usunięte"
-#: ../src/application_window.c:903
+#: ../src/application_window.c:913
msgid "All tags have been removed"
msgstr "Wszystkie etykiety zostały usunięte"
-#: ../src/application_window.c:1507 ../src/browser.c:357 ../src/browser.c:400
-#: ../src/browser.c:434 ../src/browser.c:4711 ../src/browser.c:4785
+#: ../src/application_window.c:1472 ../src/browser.c:349 ../src/browser.c:392
+#: ../src/browser.c:426 ../src/browser.c:4724 ../src/browser.c:4799
#, c-format
msgid "Failed to launch program ‘%s’"
msgstr "Uruchomienie programu \"%s\" się nie powiodło"
+#: ../src/application_window.c:2012
+#, c-format
+msgid "Could not convert filename ‘%s’ to system filename encoding"
+msgstr ""
+"Nie można przekonwertować nazwy pliku \"%s\" na systemowe kodowanie znaków"
+
+#: ../src/application_window.c:2015
+msgid "Try setting the environment variable G_FILENAME_ENCODING."
+msgstr "Proszę spróbować ustawić zmienną środowiskową G_FILENAME_ENCODING."
+
+#: ../src/application_window.c:2017 ../src/scan_dialog.c:813
+msgid "Filename translation"
+msgstr "Tłumaczenie nazw plików"
+
+#. And refresh the number of files in this directory
+#: ../src/application_window.c:2160
+#, c-format
+msgid "One file"
+msgid_plural "%u files"
+msgstr[0] "Jeden plik"
+msgstr[1] "%u pliki"
+msgstr[2] "%u plików"
+
+#. Bitrate
+#: ../src/application_window.c:2193 ../src/tags/flac_header.c:172
+#: ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:252 ../src/tags/musepack_header.c:86
+#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:230
+#: ../src/tags/wavpack_header.c:145
+#, c-format
+msgid "%d kb/s"
+msgstr "%d kb/s"
+
+#. Samplerate
+#: ../src/application_window.c:2196 ../src/tags/flac_header.c:175
+#: ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148
+#: ../src/tags/mpeg_header.c:257 ../src/tags/musepack_header.c:89
+#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:233
+#: ../src/tags/wavpack_header.c:148
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
+
+#: ../src/application_window.c:2329 ../src/easytag.c:1010
+#, c-format
+msgid "File: ‘%s’"
+msgstr "Plik: \"%s\""
+
#. Quit EasyTAG.
-#: ../src/application_window.c:2647
+#: ../src/application_window.c:2956
msgid "Normal exit"
msgstr "Prawidłowe zakończenie działania"
-#: ../src/application_window.c:2684 ../src/browser.c:860
+#: ../src/application_window.c:2990 ../src/browser.c:858
msgid "Some files have been modified but not saved"
msgstr "Niektóre pliki zostały zmodyfikowane, ale nie zostały zapisane"
-#: ../src/application_window.c:2685 ../src/browser.c:864 ../src/easytag.c:273
-#: ../src/easytag.c:494 ../src/easytag.c:626 ../src/easytag.c:634
+#: ../src/application_window.c:2991 ../src/browser.c:862 ../src/easytag.c:254
+#: ../src/easytag.c:474 ../src/easytag.c:606 ../src/easytag.c:614
msgid "_Discard"
msgstr "O_drzuć"
-#: ../src/application_window.c:2687 ../src/browser.c:866 ../src/easytag.c:274
-#: ../src/easytag.c:496 ../src/easytag.c:503 ../src/easytag.c:628
-#: ../src/easytag.c:635 ../src/playlist_dialog.c:656 ../src/tag_area.c:1855
+#: ../src/application_window.c:2993 ../src/browser.c:864 ../src/easytag.c:255
+#: ../src/easytag.c:476 ../src/easytag.c:483 ../src/easytag.c:608
+#: ../src/easytag.c:615 ../src/playlist_dialog.c:670 ../src/tag_area.c:1870
msgid "_Save"
msgstr "_Zapisz"
-#: ../src/application_window.c:2691 ../src/application_window.c:2729
-#: ../src/easytag.c:279
+#: ../src/application_window.c:2997 ../src/application_window.c:3035
+#: ../src/easytag.c:260
msgid "Quit"
msgstr "Zakończ"
-#: ../src/application_window.c:2694
+#: ../src/application_window.c:3000
msgid "Do you want to save them before quitting?"
msgstr "Zapisać je przed zakończeniem działania?"
-#: ../src/application_window.c:2723
+#: ../src/application_window.c:3029
msgid "Do you really want to quit?"
msgstr "Na pewno zakończyć działanie?"
-#: ../src/browser.c:570
+#: ../src/browser.c:562
msgid "New default directory selected for browser"
msgstr "Wybrano nowy katalog domyślny dla przeglądarki"
-#: ../src/browser.c:863
+#: ../src/browser.c:861
msgid "Do you want to save them before changing directory?"
msgstr "Zapisać je przed zmianą katalogu?"
-#: ../src/browser.c:870
+#: ../src/browser.c:868
msgid "Confirm Directory Change"
msgstr "Potwierdzenie zmiany katalogu"
-#: ../src/browser.c:2558
+#: ../src/browser.c:2563
msgid "All albums"
msgstr "Wszystkie albumy"
-#: ../src/browser.c:3811
+#: ../src/browser.c:3819
msgid "Select File"
msgstr "Wybór pliku"
-#: ../src/browser.c:3818
+#: ../src/browser.c:3826
msgid "Select Directory"
msgstr "Wybór katalogu"
-#: ../src/browser.c:4201
+#: ../src/browser.c:4209
#, c-format
msgid "Rename the directory ‘%s’ to:"
msgstr "Zmiana nazwy katalogu \"%s\" na:"
-#: ../src/browser.c:4341
+#: ../src/browser.c:4349
msgid "You must type a directory name"
msgstr "Należy wprowadzić nazwę katalogu"
-#: ../src/browser.c:4342 ../src/browser.c:4364
+#: ../src/browser.c:4350 ../src/browser.c:4372
msgid "Directory Name Error"
msgstr "Błąd nazwy katalogu"
-#: ../src/browser.c:4360
+#: ../src/browser.c:4368
#, c-format
msgid "Could not convert ‘%s’ into filename encoding"
msgstr "Nie można przekonwertować \"%s\" na kodowanie znaków nazwy pliku"
-#: ../src/browser.c:4363
+#: ../src/browser.c:4371
msgid "Please use another name."
msgstr "Proszę użyć innej nazwy."
-#: ../src/browser.c:4434
+#: ../src/browser.c:4443
#, c-format
msgid "The directory name ‘%s’ already exists."
msgstr "Nazwa katalogu \"%s\" już istnieje."
-#: ../src/browser.c:4435 ../src/easytag.c:683
+#: ../src/browser.c:4444 ../src/easytag.c:661
msgid "Rename File Error"
msgstr "Błąd zmiany nazwy pliku"
-#: ../src/browser.c:4473 ../src/browser.c:4502
+#: ../src/browser.c:4482 ../src/browser.c:4511
msgid "Rename Directory Error"
msgstr "Błąd zmiany nazwy katalogu"
-#: ../src/browser.c:4541
+#: ../src/browser.c:4552
msgid "Directory renamed"
msgstr "Zmieniono nazwę katalogu"
-#: ../src/browser.c:4703 ../src/browser.c:4777
+#: ../src/browser.c:4716 ../src/browser.c:4791
#, c-format
msgid "Executed command ‘%s’"
msgstr "Wykonano polecenie \"%s\""
@@ -3379,24 +3428,19 @@ msgstr "Błąd podczas odczytywania odpowiedzi CDDB \"%s\""
msgid "Cannot create file ‘%s’: %s"
msgstr "Nie można utworzyć pliku \"%s\": %s"
-#: ../src/cddb_dialog.c:878
-#, c-format
-msgid "Cannot load file ‘%s’: %s"
-msgstr "Nie można wczytać pliku: \"%s\": %s"
-
#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
#. Send the request
#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
#. Send the request
#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
#. Send the request
-#: ../src/cddb_dialog.c:949 ../src/cddb_dialog.c:1595
-#: ../src/cddb_dialog.c:1933
+#: ../src/cddb_dialog.c:948 ../src/cddb_dialog.c:1593
+#: ../src/cddb_dialog.c:1939
msgid "Sending request…"
msgstr "Wysyłanie żądania…"
-#: ../src/cddb_dialog.c:953 ../src/cddb_dialog.c:1599
-#: ../src/cddb_dialog.c:1937 ../src/cddb_dialog.c:3496
+#: ../src/cddb_dialog.c:952 ../src/cddb_dialog.c:1597
+#: ../src/cddb_dialog.c:1943 ../src/cddb_dialog.c:3505
#, c-format
msgid "Cannot send the request ‘%s’"
msgstr "Nie można wysłać żądania \"%s\""
@@ -3405,256 +3449,256 @@ msgstr "Nie można wysłać żądania \"%s\""
#.
#. * Read the answer
#.
-#: ../src/cddb_dialog.c:965 ../src/cddb_dialog.c:1626
-#: ../src/cddb_dialog.c:3514
+#: ../src/cddb_dialog.c:964 ../src/cddb_dialog.c:1624
+#: ../src/cddb_dialog.c:3523
msgid "Receiving data…"
msgstr "Pobieranie danych…"
-#: ../src/cddb_dialog.c:972 ../src/cddb_dialog.c:1633
-#: ../src/cddb_dialog.c:1968 ../src/cddb_dialog.c:3521
+#: ../src/cddb_dialog.c:971 ../src/cddb_dialog.c:1631
+#: ../src/cddb_dialog.c:1974 ../src/cddb_dialog.c:3530
msgid "The server returned a bad response"
msgstr "Serwer zwrócił błędną odpowiedź"
-#: ../src/cddb_dialog.c:988 ../src/cddb_dialog.c:1003
-#: ../src/cddb_dialog.c:1024 ../src/cddb_dialog.c:1646
-#: ../src/cddb_dialog.c:1984 ../src/cddb_dialog.c:3538
+#: ../src/cddb_dialog.c:987 ../src/cddb_dialog.c:1002
+#: ../src/cddb_dialog.c:1023 ../src/cddb_dialog.c:1644
+#: ../src/cddb_dialog.c:1990 ../src/cddb_dialog.c:3547
#, c-format
msgid "The server returned a bad response ‘%s’"
msgstr "Serwer zwrócił błędną odpowiedź \"%s\""
#. Load the track list of the album
-#: ../src/cddb_dialog.c:1239
+#: ../src/cddb_dialog.c:1235
msgid "Loading album track list…"
msgstr "Wczytywanie listy ścieżek albumu…"
-#: ../src/cddb_dialog.c:1793
+#: ../src/cddb_dialog.c:1791
#, c-format
msgid "Sorry, the web-based search is currently not available"
msgstr "Wyszukiwanie w sieci obecnie nie jest dostępne"
-#: ../src/cddb_dialog.c:1795 ../src/cddb_dialog.c:2155
+#: ../src/cddb_dialog.c:1794 ../src/cddb_dialog.c:2161
#, c-format
msgid "Found one matching album"
-msgid_plural "Found %d matching albums"
+msgid_plural "Found %u matching albums"
msgstr[0] "Odnaleziono jeden pasujący album"
-msgstr[1] "Odnaleziono %d pasujące albumy"
-msgstr[2] "Odnaleziono %d pasujących albumów"
+msgstr[1] "Odnaleziono %u pasujące albumy"
+msgstr[2] "Odnaleziono %u pasujących albumów"
-#: ../src/cddb_dialog.c:1956
+#: ../src/cddb_dialog.c:1962
#, c-format
msgid "Receiving data of page %d (album %d/%d)…"
msgstr "Pobieranie danych ze strony %d (album %d/%d)…"
-#: ../src/cddb_dialog.c:1958
+#: ../src/cddb_dialog.c:1964
#, c-format
msgid "Receiving data of page %d…"
msgstr "Pobieranie danych ze strony %d…"
-#: ../src/cddb_dialog.c:2122
+#: ../src/cddb_dialog.c:2128
#, c-format
msgid "More results to load…"
msgstr "Więcej wyników do wczytania…"
-#: ../src/cddb_dialog.c:2302
+#: ../src/cddb_dialog.c:2305
msgid "The number of CDDB results does not match the number of selected files"
msgstr "Liczba wyników CDDB nie pasuje do liczby zaznaczonych plików"
-#: ../src/cddb_dialog.c:2308
+#: ../src/cddb_dialog.c:2311
msgid "Write Tag from CDDB"
msgstr "Zapisz etykiety z CDDB"
-#: ../src/cddb_dialog.c:3012
+#: ../src/cddb_dialog.c:3016
msgid "Ready to search"
msgstr "Gotowe do wyszukiwania"
-#: ../src/cddb_dialog.c:3100 ../src/load_files_dialog.c:261
-#: ../src/setting.c:245
+#: ../src/cddb_dialog.c:3107 ../src/load_files_dialog.c:263
+#: ../src/setting.c:327
#, c-format
msgid "Cannot open file ‘%s’: %s"
msgstr "Nie można otworzyć pliku \"%s\": %s"
-#: ../src/cddb_dialog.c:3327
+#: ../src/cddb_dialog.c:3333
#, c-format
msgid "No file selected"
msgstr "Nie zaznaczono pliku"
#. The CD redbook standard defines the maximum number of tracks as 99, any
#. queries with more than 99 tracks will never return a result.
-#: ../src/cddb_dialog.c:3335
+#: ../src/cddb_dialog.c:3341
#, c-format
msgid "More than 99 files selected. Cannot send request"
msgstr "Zaznaczono więcej niż 99 plików. Nie można wysłać żądania"
-#: ../src/cddb_dialog.c:3341
+#: ../src/cddb_dialog.c:3347
#, c-format
msgid "One file selected"
-msgid_plural "%d files selected"
+msgid_plural "%u files selected"
msgstr[0] "Zaznaczono jeden plik"
-msgstr[1] "Zaznaczono %d pliki"
-msgstr[2] "Zaznaczono %d plików"
+msgstr[1] "Zaznaczono %u pliki"
+msgstr[2] "Zaznaczono %u plików"
#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb_dialog.c:3486
+#: ../src/cddb_dialog.c:3495
#, c-format
-msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
+msgid "Sending request (disc ID: %s, #tracks: %u, Disc length: %u)…"
msgstr ""
-"Wysyłanie żądania (identyfikator płyty: %s, # ścieżki: %d, długość płyty: %d)"
+"Wysyłanie żądania (identyfikator płyty: %s, # ścieżki: %u, długość płyty: %u)"
"…"
-#: ../src/cddb_dialog.c:3652
+#: ../src/cddb_dialog.c:3663
#, c-format
msgid "DiscID ‘%s’ gave one matching album"
-msgid_plural "DiscID ‘%s’ gave %d matching albums"
+msgid_plural "DiscID ‘%s’ gave %u matching albums"
msgstr[0] "DiscID \"%s\" zwróciło jeden pasujący album"
-msgstr[1] "DiscID \"%s\" zwróciło %d pasujące albumy"
-msgstr[2] "DiscID \"%s\" zwróciło %d pasujących albumów"
+msgstr[1] "DiscID \"%s\" zwróciło %u pasujące albumy"
+msgstr[2] "DiscID \"%s\" zwróciło %u pasujących albumów"
-#: ../src/charset.c:49
+#: ../src/charset.c:46
msgid "Arabic (IBM-864)"
msgstr "arabskie (IBM-864)"
-#: ../src/charset.c:50
+#: ../src/charset.c:47
msgid "Arabic (ISO-8859-6)"
msgstr "arabskie (ISO-8859-6)"
-#: ../src/charset.c:51
+#: ../src/charset.c:48
msgid "Arabic (Windows-1256)"
msgstr "arabskie (Windows-1256)"
-#: ../src/charset.c:52
+#: ../src/charset.c:49
msgid "Baltic (ISO-8859-13)"
msgstr "bałtyckie (ISO-8859-13)"
-#: ../src/charset.c:53
+#: ../src/charset.c:50
msgid "Baltic (ISO-8859-4)"
msgstr "bałtyckie (ISO-8859-4)"
-#: ../src/charset.c:54
+#: ../src/charset.c:51
msgid "Baltic (Windows-1257)"
msgstr "bałtyckie (Windows-1257)"
-#: ../src/charset.c:55
+#: ../src/charset.c:52
msgid "Celtic (ISO-8859-14)"
msgstr "celtyckie (ISO-8859-14)"
-#: ../src/charset.c:56
+#: ../src/charset.c:53
msgid "Central European (IBM-852)"
msgstr "środkowoeuropejskie (IBM-852)"
-#: ../src/charset.c:57
+#: ../src/charset.c:54
msgid "Central European (ISO-8859-2)"
msgstr "środkowoeuropejskie (ISO-8859-2)"
-#: ../src/charset.c:58
+#: ../src/charset.c:55
msgid "Central European (Windows-1250)"
msgstr "środkowoeuropejskie (Windows-1250)"
-#: ../src/charset.c:59
+#: ../src/charset.c:56
msgid "Chinese Simplified (GB18030)"
msgstr "chińskie uproszczone (GB18030)"
-#: ../src/charset.c:60
+#: ../src/charset.c:57
msgid "Chinese Simplified (GB2312)"
msgstr "chińskie uproszczone (GB2312)"
-#: ../src/charset.c:61
+#: ../src/charset.c:58
msgid "Chinese Traditional (Big5)"
msgstr "chińskie tradycyjne (Big5)"
-#: ../src/charset.c:62
+#: ../src/charset.c:59
msgid "Chinese Traditional (Big5-HKSCS)"
msgstr "chińskie tradycyjne (Big5-HKSCS)"
-#: ../src/charset.c:63
+#: ../src/charset.c:60
msgid "Cyrillic (IBM-855)"
msgstr "cyrylica (IBM-855)"
-#: ../src/charset.c:64
+#: ../src/charset.c:61
msgid "Cyrillic (ISO-8859-5)"
msgstr "cyrylica (ISO-8859-5)"
-#: ../src/charset.c:65
+#: ../src/charset.c:62
msgid "Cyrillic (ISO-IR-111)"
msgstr "cyrylica (ISO-IR-111)"
-#: ../src/charset.c:66
+#: ../src/charset.c:63
msgid "Cyrillic (KOI8-R)"
msgstr "cyrylica (KOI8-R)"
-#: ../src/charset.c:67
+#: ../src/charset.c:64
msgid "Cyrillic (Windows-1251)"
msgstr "cyrylica (Windows-1251)"
-#: ../src/charset.c:68
+#: ../src/charset.c:65
msgid "Cyrillic/Russian (CP-866)"
msgstr "cyrylica/rosyjskie (CP-866)"
-#: ../src/charset.c:69
+#: ../src/charset.c:66
msgid "Cyrillic/Ukrainian (KOI8-U)"
msgstr "cyrylica/ukraińskie (KOI8-U)"
-#: ../src/charset.c:70
+#: ../src/charset.c:67
msgid "English (US-ASCII)"
msgstr "angielskie (US-ASCII)"
-#: ../src/charset.c:71
+#: ../src/charset.c:68
msgid "Greek (ISO-8859-7)"
msgstr "greckie (ISO-8859-7)"
-#: ../src/charset.c:72
+#: ../src/charset.c:69
msgid "Greek (Windows-1253)"
msgstr "greckie (Windows-1253)"
-#: ../src/charset.c:73
+#: ../src/charset.c:70
msgid "Hebrew (IBM-862)"
msgstr "hebrajskie (IBM-862)"
-#: ../src/charset.c:74
+#: ../src/charset.c:71
msgid "Hebrew (Windows-1255)"
msgstr "hebrajskie (Windows-1255)"
-#: ../src/charset.c:75
+#: ../src/charset.c:72
msgid "Japanese (EUC-JP)"
msgstr "japońskie (EUC-JP)"
-#: ../src/charset.c:76
+#: ../src/charset.c:73
msgid "Japanese (ISO-2022-JP)"
msgstr "japońskie (ISO-2022-JP)"
-#: ../src/charset.c:77
+#: ../src/charset.c:74
msgid "Japanese (Shift_JIS)"
msgstr "japońskie (Shift_JIS)"
-#: ../src/charset.c:78
+#: ../src/charset.c:75
msgid "Korean (EUC-KR)"
msgstr "koreańskie (EUC-KR)"
-#: ../src/charset.c:79
+#: ../src/charset.c:76
msgid "Nordic (ISO-8859-10)"
msgstr "nordyckie (ISO-8859-10)"
-#: ../src/charset.c:80
+#: ../src/charset.c:77
msgid "South European (ISO-8859-3)"
msgstr "południowoeuropejskie (ISO-8859-3)"
-#: ../src/charset.c:81
+#: ../src/charset.c:78
msgid "Thai (TIS-620)"
msgstr "tajskie (TIS-620)"
-#: ../src/charset.c:82
+#: ../src/charset.c:79
msgid "Turkish (IBM-857)"
msgstr "tureckie (IBM-857)"
-#: ../src/charset.c:83
+#: ../src/charset.c:80
msgid "Turkish (ISO-8859-9)"
msgstr "tureckie (ISO-8859-9)"
-#: ../src/charset.c:84
+#: ../src/charset.c:81
msgid "Turkish (Windows-1254)"
msgstr "tureckie (Windows-1254)"
#. {N_("Unicode (UTF-7)"), "UTF-7" },
-#: ../src/charset.c:86
+#: ../src/charset.c:83
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
@@ -3662,55 +3706,55 @@ msgstr "Unicode (UTF-8)"
#. {N_("Unicode (UTF-16LE)"), "UTF-16LE" },
#. {N_("Unicode (UTF-32BE)"), "UTF-32BE" },
#. {N_("Unicode (UTF-32LE)"), "UTF-32LE" },
-#: ../src/charset.c:93
+#: ../src/charset.c:90
msgid "Vietnamese (VISCII)"
msgstr "wietnamskie (VISCII)"
-#: ../src/charset.c:94
+#: ../src/charset.c:91
msgid "Vietnamese (Windows-1258)"
msgstr "wietnamskie (Windows-1258)"
-#: ../src/charset.c:95
+#: ../src/charset.c:92
msgid "Visual Hebrew (ISO-8859-8)"
msgstr "hebrajskie wizualne (ISO-8859-8)"
-#: ../src/charset.c:96
+#: ../src/charset.c:93
msgid "Western (IBM-850)"
msgstr "zachodnie (IBM-850)"
-#: ../src/charset.c:97
+#: ../src/charset.c:94
msgid "Western (ISO-8859-1)"
msgstr "zachodnie (ISO-8859-1)"
-#: ../src/charset.c:98
+#: ../src/charset.c:95
msgid "Western (ISO-8859-15)"
msgstr "zachodnie (ISO-8859-15)"
-#: ../src/charset.c:99
+#: ../src/charset.c:96
msgid "Western (Windows-1252)"
msgstr "zachodnie (Windows-1252)"
-#: ../src/charset.c:511
+#: ../src/charset.c:508
#, c-format
msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
msgstr "Plik \"%s\" nie może zostać przekonwertowany na UTF-8: %s"
-#: ../src/charset.c:513 ../src/charset.c:626 ../src/charset.c:691
+#: ../src/charset.c:510 ../src/charset.c:623 ../src/charset.c:688
msgid "Invalid UTF-8"
msgstr "Nieprawidłowe UTF-8"
-#: ../src/charset.c:624
+#: ../src/charset.c:621
#, c-format
msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
msgstr ""
"Ciąg UTF-8 \"%s\" nie może zostać przekonwertowany na kodowanie pliku: %s"
-#: ../src/charset.c:689
+#: ../src/charset.c:686
#, c-format
msgid "The string ‘%s’ could not be converted into UTF-8: %s"
msgstr "Ciąg \"%s\" nie może zostać przekonwertowany na UTF-8: %s"
-#: ../src/easytag.c:269
+#: ../src/easytag.c:250
#, c-format
msgid "A file was changed by an external program"
msgid_plural "%d files were changed by an external program"
@@ -3718,184 +3762,197 @@ msgstr[0] "Plik został zmieniony przez zewnętrzny program"
msgstr[1] "%d pliki zostały zmienione przez zewnętrzny program"
msgstr[2] "%d plików zostało zmienionych przez zewnętrzny program"
-#: ../src/easytag.c:278
+#: ../src/easytag.c:259
msgid "Do you want to continue saving the file?"
msgstr "Kontynuować zapisywanie pliku?"
-#: ../src/easytag.c:339 ../src/easytag.c:360
+#: ../src/easytag.c:320 ../src/easytag.c:341
msgid "Saving files was stopped"
msgstr "Zatrzymano zapisywanie plików"
-#: ../src/easytag.c:362
+#: ../src/easytag.c:343
msgid "All files have been saved"
msgstr "Wszystkie pliki zostały zapisane"
-#: ../src/easytag.c:483
+#: ../src/easytag.c:463
#, c-format
msgid "Do you want to write the tag of file ‘%s’?"
msgstr "Zapisać etykietę pliku \"%s\"?"
-#: ../src/easytag.c:485
+#: ../src/easytag.c:465
msgid "Confirm Tag Writing"
msgstr "Potwierdzenie zapisania etykiety"
#. Directories and filename changed
-#: ../src/easytag.c:586
+#: ../src/easytag.c:566
msgid "Rename File and Directory"
msgstr "Zmiana nazw plików i katalogów"
-#: ../src/easytag.c:587
+#: ../src/easytag.c:567
msgid "File and directory rename confirmation required"
msgstr "Wymagane jest potwierdzenie zmiany nazwy pliku i katalogu"
-#: ../src/easytag.c:588
+#: ../src/easytag.c:568
#, c-format
msgid "Do you want to rename the file and directory ‘%s’ to ‘%s’?"
msgstr "Zmienić nazwę pliku i katalogu z \"%s\" na \"%s\"?"
-#: ../src/easytag.c:594
+#: ../src/easytag.c:574
msgid "Directory rename confirmation required"
msgstr "Wymagane jest potwierdzenie zmiany nazwy katalogu"
-#: ../src/easytag.c:595
+#: ../src/easytag.c:575
#, c-format
msgid "Do you want to rename the directory ‘%s’ to ‘%s’?"
msgstr "Zmienić nazwę katalogu \"%s\" na \"%s\"?"
-#: ../src/easytag.c:603
+#: ../src/easytag.c:583
msgid "File rename confirmation required"
msgstr "Wymagane jest potwierdzenie zmiany nazwy pliku"
-#: ../src/easytag.c:604
+#: ../src/easytag.c:584
#, c-format
msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
msgstr "Zmienić nazwę pliku \"%s\" na \"%s\"?"
-#: ../src/easytag.c:676
+#: ../src/easytag.c:654
#, c-format
msgid "Cannot rename file ‘%s’ to ‘%s’"
msgstr "Nie można zmienić nazwy pliku \"%s\" na \"%s\""
-#: ../src/easytag.c:690
+#: ../src/easytag.c:668
#, c-format
msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
msgstr "Nie można zmienić nazwy pliku \"%s\" na \"%s\": %s"
-#: ../src/easytag.c:695
+#: ../src/easytag.c:673
msgid "File(s) not renamed"
msgstr "Pliki, którym nie zmieniono nazwy"
-#: ../src/easytag.c:883
+#: ../src/easytag.c:858
#, c-format
msgid "Writing tag of ‘%s’"
msgstr "Zapisywanie etykiety pliku \"%s\""
-#: ../src/easytag.c:891
+#: ../src/easytag.c:866
#, c-format
msgid "Wrote tag of ‘%s’"
msgstr "Zapisano etykietę pliku \"%s\""
-#: ../src/easytag.c:907
+#: ../src/easytag.c:882
#, c-format
msgid "Cannot write tag in file ‘%s’"
msgstr "Nie można zapisać etykiety w pliku \"%s\""
-#: ../src/easytag.c:911
+#: ../src/easytag.c:886
msgid "Tag Write Error"
msgstr "Błąd zapisu etykiety"
-#: ../src/easytag.c:986 ../src/easytag.c:1214
+#: ../src/easytag.c:961 ../src/easytag.c:1192
#, c-format
msgid "Cannot read directory ‘%s’"
msgstr "Nie można odczytać katalogu \"%s\""
-#: ../src/easytag.c:990
+#: ../src/easytag.c:965
msgid "Directory Read Error"
msgstr "Błąd odczytu katalogu"
#. Read the directory recursively
-#: ../src/easytag.c:1011
+#: ../src/easytag.c:986
#, c-format
msgid "Search in progress…"
msgstr "Trwa wyszukiwanie…"
-#: ../src/easytag.c:1035 ../src/et_core.c:2986
-#, c-format
-msgid "File: ‘%s’"
-msgstr "Plik: \"%s\""
-
-#: ../src/easytag.c:1082
+#: ../src/easytag.c:1060
#, c-format
msgid "Found one file in this directory and subdirectories"
-msgid_plural "Found %d files in this directory and subdirectories"
+msgid_plural "Found %u files in this directory and subdirectories"
msgstr[0] "Odnaleziono jeden plik w tym katalogu i jego podkatalogach"
-msgstr[1] "Odnaleziono %d pliki w tym katalogu i jego podkatalogach"
-msgstr[2] "Odnaleziono %d plików w tym katalogu i jego podkatalogach"
+msgstr[1] "Odnaleziono %u pliki w tym katalogu i jego podkatalogach"
+msgstr[2] "Odnaleziono %u plików w tym katalogu i jego podkatalogach"
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1067
#, c-format
msgid "Found one file in this directory"
-msgid_plural "Found %d files in this directory"
+msgid_plural "Found %u files in this directory"
msgstr[0] "Odnaleziono jeden plik w tym katalogu"
-msgstr[1] "Odnaleziono %d pliki w tym katalogu"
-msgstr[2] "Odnaleziono %d plików w tym katalogu"
+msgstr[1] "Odnaleziono %u pliki w tym katalogu"
+msgstr[2] "Odnaleziono %u plików w tym katalogu"
-#: ../src/easytag.c:1106
+#: ../src/easytag.c:1084
msgid "No file found in this directory and subdirectories"
msgstr "Nie odnaleziono żadnego pliku w tym katalogu i jego podkatalogach"
-#: ../src/easytag.c:1108
+#: ../src/easytag.c:1086
msgid "No file found in this directory"
msgstr "Nie odnaleziono żadnego pliku w tym katalogu"
-#: ../src/easytag.c:1178
+#: ../src/easytag.c:1156
#, c-format
msgid "Error opening directory ‘%s’: %s"
msgstr "Błąd podczas otwierania katalogu \"%s\": %s"
-#: ../src/easytag.c:1234
+#: ../src/easytag.c:1212
msgid "Searching for audio files…"
msgstr "Wyszukiwanie plików dźwiękowych…"
-#: ../src/easytag.c:1235
+#: ../src/easytag.c:1213
msgid "Searching"
msgstr "Wyszukiwanie"
-#: ../src/easytag.c:1236
+#: ../src/easytag.c:1214
msgid "_Stop"
msgstr "_Zatrzymaj"
-#: ../src/et_core.c:545
+#: ../src/file_area.c:285 ../src/file_area.c:340
+msgid "File not found"
+msgstr "Nie odnaleziono pliku"
+
+#: ../src/file_area.c:290 ../src/load_files_dialog.c:223
+#, c-format
+msgid "Cannot query file information ‘%s’"
+msgstr "Nie można odpytać informacji o pliku \"%s\""
+
+#: ../src/file_area.c:324
+msgid "Read-only file"
+msgstr "Plik tylko do odczytu"
+
+#: ../src/file_list.c:252
+#, c-format
+msgid "Error reading ID3 tag from file ‘%s’: %s"
+msgstr "Błąd podczas odczytywania etykiety ID3 z pliku \"%s\": %s"
+
+#: ../src/file_list.c:263
#, c-format
msgid "Error reading tag from Ogg file ‘%s’: %s"
msgstr "Błąd podczas odczytywania etykiety z pliku Ogg \"%s\": %s"
-#: ../src/et_core.c:556
+#: ../src/file_list.c:274
#, c-format
msgid "Error reading tag from FLAC file ‘%s’: %s"
msgstr "Błąd podczas odczytywania etykiety z pliku FLAC \"%s\": %s"
-#: ../src/et_core.c:566
+#: ../src/file_list.c:284
#, c-format
msgid "Error reading APE tag from file ‘%s’: %s"
msgstr "Błąd podczas odczytywania etykiety APE z pliku \"%s\": %s"
-#: ../src/et_core.c:576
+#: ../src/file_list.c:294
#, c-format
msgid "Error reading tag from MP4 file ‘%s’: %s"
msgstr "Błąd podczas odczytywania etykiety z pliku MP4 \"%s\": %s"
-#: ../src/et_core.c:587
+#: ../src/file_list.c:305
#, c-format
msgid "Error reading tag from WavPack file ‘%s’: %s"
msgstr "Błąd podczas odczytywania etykiety z pliku WavPack \"%s\": %s"
-#: ../src/et_core.c:598
+#: ../src/file_list.c:316
#, c-format
msgid "Error reading tag from Opus file ‘%s’: %s"
msgstr "Błąd podczas odczytywania etykiety z pliku Opus \"%s\": %s"
-#: ../src/et_core.c:614
+#: ../src/file_list.c:334
#, c-format
msgid ""
"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
@@ -3904,237 +3961,181 @@ msgstr ""
"Wartość roku \"%s\" w pliku \"%s\" jest nieprawidłowa. Informacja zostanie "
"utracona podczas zapisywania"
-#: ../src/et_core.c:749
+#: ../src/file_list.c:472
#, c-format
msgid "Automatic corrections applied for file ‘%s’"
msgstr "Zastosowano automatyczne poprawki do pliku \"%s\""
-#. And refresh the number of files in this directory
-#: ../src/et_core.c:3010
-#, c-format
-msgid "One file"
-msgid_plural "%u files"
-msgstr[0] "Jeden plik"
-msgstr[1] "%u pliki"
-msgstr[2] "%u plików"
-
-#. Bitrate
-#: ../src/et_core.c:3041 ../src/tags/flac_header.c:307
-#: ../src/tags/monkeyaudio_header.c:83 ../src/tags/mp4_header.cc:144
-#: ../src/tags/mpeg_header.c:240 ../src/tags/musepack_header.c:87
-#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:229
-#: ../src/tags/wavpack_header.c:90
-#, c-format
-msgid "%d kb/s"
-msgstr "%d kb/s"
-
-#. Samplerate
-#: ../src/et_core.c:3044 ../src/tags/flac_header.c:310
-#: ../src/tags/monkeyaudio_header.c:86 ../src/tags/mp4_header.cc:148
-#: ../src/tags/mpeg_header.c:245 ../src/tags/musepack_header.c:90
-#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:232
-#: ../src/tags/wavpack_header.c:93
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
-#: ../src/et_core.c:3173
-#, c-format
-msgid "Could not convert filename ‘%s’ to system filename encoding"
-msgstr ""
-"Nie można przekonwertować nazwy pliku \"%s\" na systemowe kodowanie znaków"
-
-#: ../src/et_core.c:3175
-msgid "Try setting the environment variable G_FILENAME_ENCODING."
-msgstr "Proszę spróbować ustawić zmienną środowiskową G_FILENAME_ENCODING."
-
-#: ../src/et_core.c:3176 ../src/scan_dialog.c:719
-msgid "Filename translation"
-msgstr "Tłumaczenie nazw plików"
-
-#: ../src/file_area.c:279 ../src/file_area.c:334
-msgid "File not found"
-msgstr "Nie odnaleziono pliku"
-
-#: ../src/file_area.c:284 ../src/load_files_dialog.c:221
-#, c-format
-msgid "Cannot query file information ‘%s’"
-msgstr "Nie można odpytać informacji o pliku \"%s\""
-
-#: ../src/file_area.c:318
-msgid "Read-only file"
-msgstr "Plik tylko do odczytu"
-
-#: ../src/load_files_dialog.c:291
+#: ../src/load_files_dialog.c:293
#, c-format
msgid "Error reading file ‘%s’"
msgstr "Błąd podczas odczytywania pliku \"%s\""
-#: ../src/load_files_dialog.c:628 ../src/load_files_dialog.c:731
+#: ../src/load_files_dialog.c:633 ../src/load_files_dialog.c:736
msgid "Insert a blank line"
msgstr "Wstaw pusty wiersz"
-#: ../src/load_files_dialog.c:632 ../src/load_files_dialog.c:735
+#: ../src/load_files_dialog.c:637 ../src/load_files_dialog.c:740
msgid "Delete this line"
msgstr "Usuń ten wiersz"
-#: ../src/load_files_dialog.c:643 ../src/load_files_dialog.c:746
+#: ../src/load_files_dialog.c:648 ../src/load_files_dialog.c:751
msgid "Move this line up"
msgstr "Przesuń ten wiersz do góry"
-#: ../src/load_files_dialog.c:647 ../src/load_files_dialog.c:750
+#: ../src/load_files_dialog.c:652 ../src/load_files_dialog.c:755
msgid "Move this line down"
msgstr "Przesuń ten wiersz w dół"
-#: ../src/load_files_dialog.c:893
+#: ../src/load_files_dialog.c:898
msgid "Load Filenames From a Text File"
msgstr "Wczytaj nazwy plików z pliku tekstowego"
-#: ../src/misc.c:208
+#: ../src/misc.c:179
msgid "You must type a program name"
msgstr "Należy wprowadzić nazwę programu"
-#: ../src/misc.c:209
+#: ../src/misc.c:180
msgid "Program Name Error"
msgstr "Błąd nazwy programu"
-#: ../src/picture.c:199
+#: ../src/picture.c:175
msgid "JPEG image"
msgstr "Obraz JPEG"
-#: ../src/picture.c:201
+#: ../src/picture.c:177
msgid "PNG image"
msgstr "Obraz PNG"
-#: ../src/picture.c:203
+#: ../src/picture.c:179
msgid "GIF image"
msgstr "Obraz GIF"
-#: ../src/picture.c:205
+#: ../src/picture.c:182
msgid "Unknown image"
msgstr "Nieznany obraz"
-#: ../src/picture.c:217
+#: ../src/picture.c:194
msgid "32×32 pixel PNG file icon"
msgstr "Ikona 32×32 piksele w formacie PNG"
-#: ../src/picture.c:219
+#: ../src/picture.c:196
msgid "Other file icon"
msgstr "Inny plik ikony"
-#: ../src/picture.c:221
+#: ../src/picture.c:198
msgid "Cover (front)"
msgstr "Okładka (przód)"
-#: ../src/picture.c:223
+#: ../src/picture.c:200
msgid "Cover (back)"
msgstr "Okładka (tył)"
-#: ../src/picture.c:225
+#: ../src/picture.c:202
msgid "Leaflet page"
msgstr "Środek okładki"
-#: ../src/picture.c:227
+#: ../src/picture.c:204
msgid "Media (such as label side of CD)"
msgstr "Nośnik (np. strona z nadrukiem na CD)"
-#: ../src/picture.c:229
+#: ../src/picture.c:206
msgid "Lead artist/lead performer/soloist"
msgstr "Prowadzący wykonawca/solista"
-#: ../src/picture.c:231
+#: ../src/picture.c:208
msgid "Artist/performer"
msgstr "Wykonawca"
-#: ../src/picture.c:233
+#: ../src/picture.c:210
msgid "Conductor"
msgstr "Dyrygent"
-#: ../src/picture.c:235
+#: ../src/picture.c:212
msgid "Band/Orchestra"
msgstr "Zespół/orkiestra"
-#: ../src/picture.c:239
+#: ../src/picture.c:216
msgid "Lyricist/text writer"
msgstr "Tekściarz/autor tekstów"
-#: ../src/picture.c:241
+#: ../src/picture.c:218
msgid "Recording location"
msgstr "Miejsce nagrywania"
-#: ../src/picture.c:243
+#: ../src/picture.c:220
msgid "During recording"
msgstr "Podczas nagrywania"
-#: ../src/picture.c:245
+#: ../src/picture.c:222
msgid "During performance"
msgstr "Podczas występu"
-#: ../src/picture.c:247
+#: ../src/picture.c:224
msgid "Movie/video screen capture"
msgstr "Zrzut ekranu z filmu/wideo"
-#: ../src/picture.c:249
+#: ../src/picture.c:226
msgid "A bright colored fish"
msgstr "Jaskrawo pokolorowana ryba"
-#: ../src/picture.c:251
+#: ../src/picture.c:228
msgid "Illustration"
msgstr "Ilustracja"
-#: ../src/picture.c:253
+#: ../src/picture.c:230
msgid "Band/Artist logotype"
msgstr "Logo zespołu/wykonawcy"
-#: ../src/picture.c:255
+#: ../src/picture.c:232
msgid "Publisher/studio logotype"
msgstr "Logo wydawcy/studia"
-#: ../src/picture.c:259
+#: ../src/picture.c:236
msgid "Unknown image type"
msgstr "Nieznany typ obrazu"
-#: ../src/picture.c:287 ../src/picture.c:296
+#: ../src/picture.c:262 ../src/picture.c:268
msgid "pixels"
msgstr "pikseli"
-#: ../src/picture.c:287 ../src/picture.c:296
+#: ../src/picture.c:262 ../src/picture.c:268
msgid "Type"
msgstr "Typ"
-#: ../src/playlist_dialog.c:528
+#: ../src/playlist_dialog.c:541
#, c-format
msgid "Cannot write playlist file ‘%s’"
msgstr "Nie można zapisać pliku listy odtwarzania \"%s\""
-#: ../src/playlist_dialog.c:532
+#: ../src/playlist_dialog.c:545
msgid "Playlist File Error"
msgstr "Błąd pliku listy odtwarzania"
-#: ../src/playlist_dialog.c:540
+#: ../src/playlist_dialog.c:553
#, c-format
msgid "Wrote playlist file ‘%s’"
msgstr "Zapisano plik listy odtwarzania \"%s\""
-#: ../src/playlist_dialog.c:622 ../src/scan_dialog.c:2770
-#: ../src/scan_dialog.c:2832
+#: ../src/playlist_dialog.c:636 ../src/scan_dialog.c:2819
+#: ../src/scan_dialog.c:2882
msgid "Invalid scanner mask"
msgstr "Nieprawidłowa maska skanera"
-#: ../src/playlist_dialog.c:653
+#: ../src/playlist_dialog.c:667
msgid "Generate Playlist"
msgstr "Utworzenie listy odtwarzania"
#. The window
-#: ../src/preferences_dialog.c:293
+#: ../src/preferences_dialog.c:289
msgid "Preferences"
msgstr "Preferencje"
-#: ../src/preferences_dialog.c:1130
+#: ../src/preferences_dialog.c:1126
msgid "The selected default path is invalid"
msgstr "Wybrana domyślna ścieżka jest nieprawidłowa"
-#: ../src/preferences_dialog.c:1132
+#: ../src/preferences_dialog.c:1128
#, c-format
msgid ""
"Path: ‘%s’\n"
@@ -4143,73 +4144,73 @@ msgstr ""
"Ścieżka: \"%s\"\n"
"Błąd: %s"
-#: ../src/preferences_dialog.c:1136
+#: ../src/preferences_dialog.c:1132
msgid "Invalid Path Error"
msgstr "Błąd nieprawidłowej ścieżki"
-#: ../src/scan_dialog.c:307
+#: ../src/scan_dialog.c:402
#, c-format
msgid "Cannot calculate CRC value of file ‘%s’"
msgstr "Nie można obliczyć wartości CRC pliku \"%s\""
-#: ../src/scan_dialog.c:323
+#: ../src/scan_dialog.c:417
msgid "Tag successfully scanned"
msgstr "Pomyślnie zeskanowany etykiety"
-#: ../src/scan_dialog.c:326
+#: ../src/scan_dialog.c:420
#, c-format
msgid "Tag successfully scanned ‘%s’"
msgstr "Pomyślnie zeskanowany etykiety \"%s\""
-#: ../src/scan_dialog.c:369
+#: ../src/scan_dialog.c:463
#, c-format
msgid "The extension ‘%s’ was not found in filename ‘%s’"
msgstr "Rozszerzenie \"%s\" nie zostało odnalezione w pliku \"%s\""
-#: ../src/scan_dialog.c:459 ../src/scan_dialog.c:490
+#: ../src/scan_dialog.c:555 ../src/scan_dialog.c:586
#, c-format
msgid "Cannot find separator ‘%s’ within ‘%s’"
msgstr "Nie można odnaleźć separatora \"%s\" wewnątrz \"%s\""
-#: ../src/scan_dialog.c:717
+#: ../src/scan_dialog.c:811
#, c-format
msgid "Could not convert filename ‘%s’ into system filename encoding"
msgstr ""
"Nie można przekonwertować nazwy pliku \"%s\" na systemowe kodowanie znaków"
-#: ../src/scan_dialog.c:742
+#: ../src/scan_dialog.c:836
msgid "New filename successfully scanned"
msgstr "Pomyślnie zeskanowano nową nazwę pliku"
-#: ../src/scan_dialog.c:746
+#: ../src/scan_dialog.c:840
#, c-format
msgid "New filename successfully scanned ‘%s’"
msgstr "Pomyślnie zeskanowano nową nazwę pliku \"%s\""
-#: ../src/scan_dialog.c:1109
+#: ../src/scan_dialog.c:1212
#, c-format
msgid "Error while processing fields ‘%s’"
msgstr "Błąd podczas przetwarzania pól \"%s\""
-#: ../src/scan_dialog.c:2040
+#: ../src/scan_dialog.c:2088
msgid "New_mask"
msgstr "Nowa_maska"
#. The window
-#: ../src/scan_dialog.c:2257
+#: ../src/scan_dialog.c:2305
msgid "Tag and Filename Scan"
msgstr "Skanowanie etykiet i nazw plików"
#. 'Scan selected files' button
-#: ../src/scan_dialog.c:2263
+#: ../src/scan_dialog.c:2311
msgid "Scan Files"
msgstr "Skanuj pliki"
-#: ../src/scan_dialog.c:2269
+#: ../src/scan_dialog.c:2317
msgid "Scan selected files"
msgstr "Skanuj zaznaczone pliki"
-#: ../src/scan_dialog.c:2907
+#: ../src/scan_dialog.c:2956
msgid "All tags have been scanned"
msgstr "Wszystkie etykiety zostały zeskanowane"
@@ -4229,56 +4230,31 @@ msgstr "Znajdź pliki"
msgid "Ready to search…"
msgstr "Gotowe do wyszukiwania…"
-#: ../src/setting.c:142
-#, c-format
-msgid "Cannot create or open file ‘%s’: %s"
-msgstr "Nie można utworzyć lub otworzyć pliku \"%s\": %s"
-
-#: ../src/setting.c:192
+#: ../src/setting.c:245
#, c-format
msgid "Cannot write list to file ‘%s’: %s"
msgstr "Nie można zapisać listy do pliku \"%s\": %s"
-#: ../src/setting.c:210
-#, c-format
-msgid "Error while writing list file ‘%s’"
-msgstr "Błąd podczas zapisywania pliku listy \"%s\""
-
#. Fall back to defaults.
-#: ../src/setting.c:290
+#: ../src/setting.c:350
msgid "Loading default ‘Fill Tag’ masks…"
msgstr "Wczytywanie domyślnych masek \"Wypełnianie etykiet\"…"
#. Fall back to defaults.
-#: ../src/setting.c:320
+#: ../src/setting.c:380
msgid "Loading default ‘Rename File’ masks…"
msgstr "Wczytywanie domyślnych masek \"Zmiana nazw plików\"…"
-#: ../src/setting.c:406
-#, c-format
-msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
-msgstr "Przenoszenie konfiguracji z katalogu \"%s\" do \"%s\""
-
-#: ../src/setting.c:430
-#, c-format
-msgid "Failed to migrate configuration file ‘%s’"
-msgstr "Przeniesienie pliku konfiguracji \"%s\" się nie powiodło"
-
-#: ../src/setting.c:467
-#, c-format
-msgid "Cannot create directory ‘%s’: %s"
-msgstr "Nie można utworzyć katalogu \"%s\": %s"
-
-#: ../src/status_bar.c:145
+#: ../src/status_bar.c:146
msgid "Ready to start"
msgstr "Gotowe do rozpoczęcia"
-#: ../src/tag_area.c:187
+#: ../src/tag_area.c:186
#, c-format
msgid "Selected files tagged with title ‘%s’"
msgstr "Zaznaczonym plikom ustawiono tytuł \"%s\""
-#: ../src/tag_area.c:192
+#: ../src/tag_area.c:191
msgid "Removed title from selected files"
msgstr "Usunięto tytuły zaznaczonym plikom"
@@ -4291,177 +4267,177 @@ msgstr "Zaznaczonym plikom ustawiono wykonawcę na \"%s\""
msgid "Removed artist from selected files"
msgstr "Usunięto wykonawcę z zaznaczonych plików"
-#: ../src/tag_area.c:230
+#: ../src/tag_area.c:232
#, c-format
msgid "Selected files tagged with album artist ‘%s’"
msgstr "Zaznaczonym plikom ustawiono wykonawcę albumu na \"%s\""
-#: ../src/tag_area.c:235
+#: ../src/tag_area.c:237
msgid "Removed album artist from selected files"
msgstr "Usunięto wykonawcę albumu z zaznaczonych plików"
-#: ../src/tag_area.c:252
+#: ../src/tag_area.c:255
#, c-format
msgid "Selected files tagged with album ‘%s’"
msgstr "Zaznaczonym plikom ustawiono album na \"%s\""
-#: ../src/tag_area.c:257
+#: ../src/tag_area.c:260
msgid "Removed album name from selected files"
msgstr "Usunięto album z zaznaczonych plików"
-#: ../src/tag_area.c:295
+#: ../src/tag_area.c:298
#, c-format
msgid "Selected files tagged with disc number ‘%s/%s’"
msgstr "Zaznaczonym plikom ustawiono numer płyty na \"%s/%s\""
-#: ../src/tag_area.c:300
+#: ../src/tag_area.c:305
#, c-format
msgid "Selected files tagged with disc number like ‘xx’"
msgstr "Zaznaczonym plikom ustawiono numer płyty na \"xx\""
-#: ../src/tag_area.c:305
+#: ../src/tag_area.c:310
msgid "Removed disc number from selected files"
msgstr "Usunięto numer płyty z zaznaczonych plików"
-#: ../src/tag_area.c:322
+#: ../src/tag_area.c:330
#, c-format
msgid "Selected files tagged with year ‘%s’"
msgstr "Zaznaczonym plikom ustawiono rok na \"%s\""
-#: ../src/tag_area.c:327
+#: ../src/tag_area.c:335
msgid "Removed year from selected files"
msgstr "Usunięto rok z zaznaczonych plików"
-#: ../src/tag_area.c:354 ../src/tag_area.c:448
+#: ../src/tag_area.c:365 ../src/tag_area.c:470
#, c-format
msgid "Selected files tagged with track like ‘xx/%s’"
msgstr "Zaznaczonym plikom ustawiono numer ścieżki na \"xx/%s\""
-#: ../src/tag_area.c:358
+#: ../src/tag_area.c:369
#, c-format
msgid "Selected files tagged with track like ‘xx’"
msgstr "Zaznaczonym plikom ustawiono numer ścieżki na \"xx\""
-#: ../src/tag_area.c:363 ../src/tag_area.c:453
+#: ../src/tag_area.c:374 ../src/tag_area.c:475
msgid "Removed track number from selected files"
msgstr "Usunięto numer ścieżki z zaznaczonych plików"
#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/tag_area.c:421
+#: ../src/tag_area.c:433
#, c-format
msgid "Selected tracks numbered sequentially"
msgstr "Zaznaczone pliki ponumerowano według kolejności"
-#: ../src/tag_area.c:470
+#: ../src/tag_area.c:495
#, c-format
msgid "Selected files tagged with genre ‘%s’"
msgstr "Zaznaczonym plikom ustawiono gatunek na \"%s\""
-#: ../src/tag_area.c:475
+#: ../src/tag_area.c:500
msgid "Removed genre from selected files"
msgstr "Usunięto gatunek z zaznaczonych plików"
-#: ../src/tag_area.c:499
+#: ../src/tag_area.c:525
#, c-format
msgid "Selected files tagged with comment ‘%s’"
msgstr "Zaznaczonym plikom ustawiono komentarz na \"%s\""
-#: ../src/tag_area.c:504
+#: ../src/tag_area.c:530
msgid "Removed comment from selected files"
msgstr "Usunięto komentarz z zaznaczonych plików"
-#: ../src/tag_area.c:520
+#: ../src/tag_area.c:548
#, c-format
msgid "Selected files tagged with composer ‘%s’"
msgstr "Zaznaczonym plikom ustawiono kompozytora na \"%s\""
-#: ../src/tag_area.c:525
+#: ../src/tag_area.c:553
msgid "Removed composer from selected files"
msgstr "Usunięto kompozytora z zaznaczonych plików"
-#: ../src/tag_area.c:542
+#: ../src/tag_area.c:571
#, c-format
msgid "Selected files tagged with original artist ‘%s’"
msgstr "Zaznaczonym plikom ustawiono pierwotnego wykonawcę na \"%s\""
-#: ../src/tag_area.c:547
+#: ../src/tag_area.c:576
msgid "Removed original artist from selected files"
msgstr "Usunięto pierwotnego wykonawcę z zaznaczonych plików"
-#: ../src/tag_area.c:564
+#: ../src/tag_area.c:594
#, c-format
msgid "Selected files tagged with copyright ‘%s’"
msgstr "Zaznaczonym plikom ustawiono prawa autorskie na \"%s\""
-#: ../src/tag_area.c:569
+#: ../src/tag_area.c:599
msgid "Removed copyright from selected files"
msgstr "Usunięto prawa autorskie z zaznaczonych plików"
-#: ../src/tag_area.c:586
+#: ../src/tag_area.c:617
#, c-format
msgid "Selected files tagged with URL ‘%s’"
msgstr "Zaznaczonym plikom ustawiono adres URL na \"%s\""
-#: ../src/tag_area.c:591
+#: ../src/tag_area.c:622
msgid "Removed URL from selected files"
msgstr "Usunięto adres URL z zaznaczonych plików"
-#: ../src/tag_area.c:608
+#: ../src/tag_area.c:640
#, c-format
msgid "Selected files tagged with encoder name ‘%s’"
msgstr "Zaznaczonym plikom ustawiono nazwisko kodera na \"%s\""
-#: ../src/tag_area.c:613
+#: ../src/tag_area.c:645
msgid "Removed encoder name from selected files"
msgstr "Usunięto nazwisko kodera z zaznaczonych plików"
-#: ../src/tag_area.c:647
+#: ../src/tag_area.c:680
msgid "Selected files tagged with images"
msgstr "Ustawiono obrazy w zaznaczonych plikach"
-#: ../src/tag_area.c:651
+#: ../src/tag_area.c:684
msgid "Removed images from selected files"
msgstr "Usunięto obrazy z zaznaczonych plików"
#. Menu items
-#: ../src/tag_area.c:820
+#: ../src/tag_area.c:851
msgid "Tag selected files with this field"
msgstr "Wartość z tego pola zostanie wstawiona do zaznaczonych plików"
-#: ../src/tag_area.c:847
+#: ../src/tag_area.c:878
msgid "All uppercase"
msgstr "Wszystko wielką literą"
-#: ../src/tag_area.c:853
+#: ../src/tag_area.c:884
msgid "All lowercase"
msgstr "Wszystko małą literą"
-#: ../src/tag_area.c:859
+#: ../src/tag_area.c:890
msgid "First letter uppercase"
msgstr "Wielka pierwsza litera"
-#: ../src/tag_area.c:865
+#: ../src/tag_area.c:896
msgid "First letter uppercase of each word"
msgstr "Wielka pierwsza litera każdego słowa"
-#: ../src/tag_area.c:881
+#: ../src/tag_area.c:912
msgid "Insert space before uppercase letter"
msgstr "Wstawianie spacji przed wielką literą"
-#: ../src/tag_area.c:887
+#: ../src/tag_area.c:918
msgid "Remove duplicate spaces or underscores"
msgstr "Usuwanie powtarzających się spacji lub znaków podkreślenia"
-#: ../src/tag_area.c:893
+#: ../src/tag_area.c:924
msgid "Remove all text"
msgstr "Usuwanie całego tekstu"
-#: ../src/tag_area.c:1269 ../src/tag_area.c:1347
+#: ../src/tag_area.c:1286 ../src/tag_area.c:1364
#, c-format
msgid "Error parsing image data ‘%s’"
msgstr "Błąd podczas przetwarzania danych obrazu \"%s\""
-#: ../src/tag_area.c:1329
+#: ../src/tag_area.c:1346
msgid ""
"Cannot display the image because not enough data has been read to determine "
"how to create the image buffer"
@@ -4469,120 +4445,120 @@ msgstr ""
"Nie można wyświetlić obrazu, ponieważ za mała ilość danych została "
"odczytana, aby ustalić, jak utworzyć bufor obrazu"
-#: ../src/tag_area.c:1336
+#: ../src/tag_area.c:1353
msgid "Cannot display the image"
msgstr "Nie można wyświetlić obrazu"
-#: ../src/tag_area.c:1338
+#: ../src/tag_area.c:1355
msgid ""
"Not enough data has been read to determine how to create the image buffer."
msgstr ""
"Za mała ilość danych została odczytana, aby ustalić, jak utworzyć bufor "
"obrazu."
-#: ../src/tag_area.c:1340
+#: ../src/tag_area.c:1357
msgid "Load Image File"
msgstr "Wczytaj plik obrazu"
-#: ../src/tag_area.c:1384 ../src/tag_area.c:1409
+#: ../src/tag_area.c:1401 ../src/tag_area.c:1426
#, c-format
msgid "Image file not loaded ‘%s’"
msgstr "Plik obrazu nie został wczytany \"%s\""
-#: ../src/tag_area.c:1401
+#: ../src/tag_area.c:1418
#, c-format
msgid "Cannot open file ‘%s’"
msgstr "Nie można otworzyć pliku \"%s\""
-#: ../src/tag_area.c:1405
+#: ../src/tag_area.c:1422
msgid "Image File Error"
msgstr "Błąd pliku obrazu"
-#: ../src/tag_area.c:1416
+#: ../src/tag_area.c:1433
msgid "Image file loaded"
msgstr "Wczytano plik obrazu"
-#: ../src/tag_area.c:1487
+#: ../src/tag_area.c:1513
msgid "Add Images"
msgstr "Dodaj obrazy"
-#: ../src/tag_area.c:1498 ../src/tag_area.c:1863
+#: ../src/tag_area.c:1523 ../src/tag_area.c:1877
msgid "All Files"
msgstr "Wszystkie pliki"
-#: ../src/tag_area.c:1504 ../src/tag_area.c:1869
+#: ../src/tag_area.c:1530 ../src/tag_area.c:1884
msgid "PNG and JPEG"
msgstr "PNG i JPEG"
-#: ../src/tag_area.c:1648
+#: ../src/tag_area.c:1671
#, c-format
msgid "Image Properties %d/%d"
msgstr "Właściwości obrazu %d/%d"
-#: ../src/tag_area.c:1848
+#: ../src/tag_area.c:1863
#, c-format
msgid "Save Image %d/%d"
msgstr "Zapisz obraz %d/%d"
-#: ../src/tag_area.c:1925
+#: ../src/tag_area.c:1943
#, c-format
msgid "Image file not saved ‘%s’"
msgstr "Plik obrazu nie został zapisany \"%s\""
-#: ../src/tag_area.c:2268
+#: ../src/tag_area.c:2291
msgid "Tag selected files with this genre"
msgstr "Gatunek z tego pola zostanie wstawiony do zaznaczonych plików"
-#: ../src/tag_area.c:2998
+#: ../src/tag_area.c:3018
msgid "ID3 Tag"
msgstr "Etykieta ID3"
-#: ../src/tag_area.c:3003
+#: ../src/tag_area.c:3023
msgid "Ogg Vorbis Tag"
msgstr "Etykieta Ogg Vorbis"
-#: ../src/tag_area.c:3008
+#: ../src/tag_area.c:3028
msgid "FLAC Vorbis Tag"
msgstr "Etykieta FLAC Vorbis"
-#: ../src/tag_area.c:3012
+#: ../src/tag_area.c:3032
msgid "APE Tag"
msgstr "Etykieta APE"
-#: ../src/tag_area.c:3016
+#: ../src/tag_area.c:3036
msgid "MP4/M4A/AAC Tag"
msgstr "Etykieta MP4/M4A/AAC"
-#: ../src/tag_area.c:3021
+#: ../src/tag_area.c:3041
msgid "Wavpack Tag"
msgstr "Etykieta WavPack"
-#: ../src/tag_area.c:3026
+#: ../src/tag_area.c:3046
msgid "Opus Tag"
msgstr "Etykieta Opus"
-#: ../src/tag_area.c:3266
+#: ../src/tag_area.c:3286
#, c-format
-msgid "Images (%d)"
-msgstr "Obrazy (%d)"
+msgid "Images (%u)"
+msgstr "Obrazy (%u)"
-#: ../src/tags/ape_tag.c:66 ../src/tags/flac_tag.c:136
-#: ../src/tags/mp4_header.cc:58 ../src/tags/mp4_header.cc:67
-#: ../src/tags/mp4_tag.cc:66 ../src/tags/mp4_tag.cc:79
-#: ../src/tags/mp4_tag.cc:85 ../src/tags/ogg_header.c:228
+#: ../src/tags/ape_tag.c:63 ../src/tags/mp4_header.cc:58
+#: ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:72
+#: ../src/tags/mp4_tag.cc:85 ../src/tags/mp4_tag.cc:91
+#: ../src/tags/ogg_header.c:227
#, c-format
msgid "Error while opening file: %s"
msgstr "Błąd podczas otwierania pliku: %s"
-#: ../src/tags/ape_tag.c:369
+#: ../src/tags/ape_tag.c:385
msgid "Failed to write APE tag"
msgstr "Zapisanie etykiety APE się nie powiodło"
-#: ../src/tags/flac_header.c:213
+#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:116
msgid "Error opening FLAC file"
msgstr "Błąd podczas otwierania pliku FLAC"
-#: ../src/tags/flac_header.c:300
+#: ../src/tags/flac_header.c:165
msgid "FLAC File"
msgstr "Plik FLAC"
@@ -4590,23 +4566,25 @@ msgstr "Plik FLAC"
#. Mode
#. mpeg4ip library seems to always return -1
#. Mode
-#: ../src/tags/flac_header.c:313 ../src/tags/mp4_header.cc:152
-#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:235
-#: ../src/tags/wavpack_header.c:96
+#: ../src/tags/flac_header.c:178 ../src/tags/mp4_header.cc:152
+#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:236
+#: ../src/tags/wavpack_header.c:151
msgid "Channels:"
msgstr "Kanały:"
-#: ../src/tags/flac_tag.c:857 ../src/tags/flac_tag.c:869
+#: ../src/tags/flac_tag.c:831 ../src/tags/flac_tag.c:864
+#: ../src/tags/flac_tag.c:878
#, c-format
msgid "Error while opening file ‘%s’ as FLAC: %s"
msgstr "Błąd podczas otwierania pliku \"%s\" jako FLAC: %s"
-#: ../src/tags/flac_tag.c:1130
+#: ../src/tags/flac_tag.c:1160 ../src/tags/flac_tag.c:1172
+#: ../src/tags/flac_tag.c:1192
#, c-format
msgid "Failed to write comments to file ‘%s’: %s"
msgstr "Zapisanie komentarzy do pliku \"%s\" się nie powiodło: %s"
-#: ../src/tags/id3_tag.c:211
+#: ../src/tags/id3_tag.c:209
#, c-format
msgid ""
"As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
@@ -4615,31 +4593,31 @@ msgstr ""
"Uszkodzony plik \"%s\" spowoduje błąd w bibliotece id3lib, więc nie zostanie "
"on przetworzony"
-#: ../src/tags/id3_tag.c:213
+#: ../src/tags/id3_tag.c:211
msgid "Corrupted file"
msgstr "Uszkodzony plik"
-#: ../src/tags/id3_tag.c:595
+#: ../src/tags/id3_tag.c:613
#, c-format
msgid "Removed tag of ‘%s’"
msgstr "Usunięto etykietę z pliku \"%s\""
-#: ../src/tags/id3_tag.c:602 ../src/tags/id3_tag.c:729
+#: ../src/tags/id3_tag.c:620 ../src/tags/id3_tag.c:750
#, c-format
msgid "Error while removing ID3v1 tag of ‘%s’: %s"
msgstr "Błąd podczas usuwania etykiety ID3v1 pliku \"%s\": %s"
-#: ../src/tags/id3_tag.c:611 ../src/tags/id3_tag.c:692
+#: ../src/tags/id3_tag.c:629 ../src/tags/id3_tag.c:713
#, c-format
msgid "Error while removing ID3v2 tag of ‘%s’: %s"
msgstr "Błąd podczas usuwania etykiety ID3v2 pliku \"%s\": %s"
-#: ../src/tags/id3_tag.c:637
+#: ../src/tags/id3_tag.c:655
#, c-format
msgid "Error while updating ID3v2 tag of ‘%s’: %s"
msgstr "Błąd podczas uaktualniania etykiety ID3v2 pliku \"%s\": %s"
-#: ../src/tags/id3_tag.c:667
+#: ../src/tags/id3_tag.c:687
msgid ""
"You have tried to save this tag to Unicode but it was detected that your "
"version of id3lib is buggy"
@@ -4647,7 +4625,7 @@ msgstr ""
"Próbowano zapisać tę etykietę w kodowaniu Unicode, ale wykryto wersję "
"biblioteki id3lib z błędami"
-#: ../src/tags/id3_tag.c:669
+#: ../src/tags/id3_tag.c:689
#, c-format
msgid ""
"If you reload this file, some characters in the tag may not be displayed "
@@ -4666,121 +4644,98 @@ msgstr ""
"\n"
"Plik: %s"
-#: ../src/tags/id3_tag.c:676
+#: ../src/tags/id3_tag.c:696
msgid "Buggy id3lib"
msgstr "Biblioteka id3lib z błędami"
-#: ../src/tags/id3_tag.c:717
+#: ../src/tags/id3_tag.c:738
#, c-format
msgid "Error while updating ID3v1 tag of ‘%s’: %s"
msgstr "Błąd podczas aktualizowania etykiety ID3v1 pliku \"%s\": %s"
-#: ../src/tags/id3_tag.c:751
+#: ../src/tags/id3_tag.c:772
msgid "No error reported"
msgstr "Nie zgłoszono błędów"
-#: ../src/tags/id3_tag.c:753
+#: ../src/tags/id3_tag.c:774
msgid "No available memory"
msgstr "Brak dostępnej pamięci"
-#: ../src/tags/id3_tag.c:755
+#: ../src/tags/id3_tag.c:776
msgid "No data to parse"
msgstr "Brak danych do przetwarzania"
-#: ../src/tags/id3_tag.c:757
+#: ../src/tags/id3_tag.c:778
msgid "Improperly formatted data"
msgstr "Niepoprawnie sformatowane dane"
-#: ../src/tags/id3_tag.c:759
+#: ../src/tags/id3_tag.c:780
msgid "No buffer to write to"
msgstr "Brak bufora do zapisu"
-#: ../src/tags/id3_tag.c:761
+#: ../src/tags/id3_tag.c:782
msgid "Buffer is too small"
msgstr "Bufor jest za mały"
-#: ../src/tags/id3_tag.c:763
+#: ../src/tags/id3_tag.c:784
msgid "Invalid frame ID"
msgstr "Nieprawidłowy identyfikator ramki"
-#: ../src/tags/id3_tag.c:765
+#: ../src/tags/id3_tag.c:786
msgid "Requested field not found"
msgstr "Nie odnaleziono żądanego pola"
-#: ../src/tags/id3_tag.c:767
+#: ../src/tags/id3_tag.c:788
msgid "Unknown field type"
msgstr "Nieznany typ pola"
-#: ../src/tags/id3_tag.c:769
+#: ../src/tags/id3_tag.c:790
msgid "Tag is already attached to a file"
msgstr "Plik już posiada dołączoną etykietę"
-#: ../src/tags/id3_tag.c:771
+#: ../src/tags/id3_tag.c:792
msgid "Invalid tag version"
msgstr "Nieprawidłowa wersja etykiety"
-#: ../src/tags/id3_tag.c:773
+#: ../src/tags/id3_tag.c:794
msgid "No file to parse"
msgstr "Brak pliku do przetwarzania"
-#: ../src/tags/id3_tag.c:775
+#: ../src/tags/id3_tag.c:796
msgid "Attempting to write to a read-only file"
msgstr "Próba zapisania do pliku tylko do odczytu"
-#: ../src/tags/id3_tag.c:777
+#: ../src/tags/id3_tag.c:798
msgid "Error in compression/uncompression"
msgstr "Błąd podczas kompresji/dekompresji"
-#: ../src/tags/id3_tag.c:779
+#: ../src/tags/id3_tag.c:800
msgid "Unknown error message"
msgstr "Nieznany komunikat błędu"
-#: ../src/tags/id3_tag.c:1456
+#: ../src/tags/id3_tag.c:1487
msgid "Error while creating temporary file"
msgstr "Błąd podczas tworzenia pliku tymczasowego"
-#: ../src/tags/id3v24_tag.c:137 ../src/tags/id3v24_tag.c:192
-#: ../src/tags/id3v24_tag.c:230 ../src/tags/id3v24_tag.c:241
-#: ../src/tags/id3v24_tag.c:941 ../src/tags/id3v24_tag.c:948
-#: ../src/tags/id3v24_tag.c:974 ../src/tags/id3v24_tag.c:1014
-#: ../src/tags/mp4_tag.cc:95
+#: ../src/tags/id3v24_tag.c:132 ../src/tags/id3v24_tag.c:187
+#: ../src/tags/id3v24_tag.c:225 ../src/tags/id3v24_tag.c:236
+#: ../src/tags/id3v24_tag.c:952 ../src/tags/id3v24_tag.c:959
+#: ../src/tags/id3v24_tag.c:985 ../src/tags/id3v24_tag.c:1025
+#: ../src/tags/mp4_tag.cc:101 ../src/tags/ogg_header.c:277
msgid "Error reading tags from file"
msgstr "Błąd podczas odczytywania etykiet z pliku"
-#. Translators: The first string is a filename, the
-#. * second string is the number of bytes that were
-#. * missing (not read for some reason) while reading
-#. * from the file.
-#.
-#: ../src/tags/id3v24_tag.c:1678
-#, c-format
-msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
-msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
-msgstr[0] "Nie można zapisać etykiety w pliku \"%s\" (brak jednego bajtu)"
-msgstr[1] "Nie można zapisać etykiety w pliku \"%s\" (brak %s bajtów)"
-msgstr[2] "Nie można zapisać etykiety w pliku \"%s\" (brak %s bajtów)"
-
-#: ../src/tags/id3v24_tag.c:1701
-#, c-format
-msgid "Cannot save tag of file ‘%s’"
-msgstr "Nie można zapisać etykiety pliku \"%s\""
-
-#: ../src/tags/id3v24_tag.c:1713
-#, c-format
-msgid "Size error while saving tag of ‘%s’"
-msgstr "Błąd rozmiaru podczas etykiety pliku \"%s\""
-
-#: ../src/tags/monkeyaudio_header.c:47
+#: ../src/tags/monkeyaudio_header.c:46
msgid "Error opening Monkey’s Audio file"
msgstr "Błąd podczas otwierania pliku Monkey's Audio"
#. Mode changed to profile name
-#: ../src/tags/monkeyaudio_header.c:79 ../src/tags/musepack_header.c:82
+#: ../src/tags/monkeyaudio_header.c:78 ../src/tags/musepack_header.c:81
msgid "Profile:"
msgstr "Profil:"
-#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:86
-#: ../src/tags/mp4_tag.cc:282
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:92
+#: ../src/tags/mp4_tag.cc:288
msgid "MP4 format invalid"
msgstr "Nieprawidłowy format MP4"
@@ -4792,18 +4747,18 @@ msgstr "Błąd podczas odczytywania właściwości z pliku"
msgid "MP4/AAC File"
msgstr "Plik MP4/AAC"
-#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:236
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:248
#, c-format
msgid "~%d kb/s"
msgstr "~%d kb/s"
-#: ../src/tags/mp4_tag.cc:258 ../src/tags/mp4_tag.cc:275
-#: ../src/tags/mp4_tag.cc:281
+#: ../src/tags/mp4_tag.cc:265 ../src/tags/mp4_tag.cc:281
+#: ../src/tags/mp4_tag.cc:287
#, c-format
msgid "Error while opening file ‘%s’: %s"
msgstr "Błąd podczas otwierania pliku \"%s\": %s"
-#: ../src/tags/mp4_tag.cc:293
+#: ../src/tags/mp4_tag.cc:298
#, c-format
msgid "Error reading tags from file ‘%s’"
msgstr "Błąd podczas odczytywania etykiet z pliku \"%s\""
@@ -4824,71 +4779,71 @@ msgstr "Dwukanałowy"
msgid "Single channel"
msgstr "Jednokanałowy"
-#: ../src/tags/mpeg_header.c:206
+#: ../src/tags/mpeg_header.c:216
msgid "MP3 File"
msgstr "Plik MP3"
-#: ../src/tags/mpeg_header.c:209
+#: ../src/tags/mpeg_header.c:220
msgid "MP2 File"
msgstr "Plik MP2"
#. MPEG, Layer versions
-#: ../src/tags/mpeg_header.c:216
+#: ../src/tags/mpeg_header.c:228
msgid "MPEG"
msgstr "MPEG"
-#: ../src/tags/musepack_header.c:47
+#: ../src/tags/musepack_header.c:46
msgid "Error opening Musepack file"
msgstr "Błąd podczas otwierania pliku MusePack"
-#: ../src/tags/musepack_header.c:79
+#: ../src/tags/musepack_header.c:78
msgid "MusePack File"
msgstr "Plik MusePack"
-#: ../src/tags/ogg_header.c:244
+#: ../src/tags/ogg_header.c:243
msgid ""
"The specified bitstream does not exist or the file has been initialized "
"improperly"
msgstr ""
"Podany strumień bitów nie istnieje lub plik został niepoprawnie zainicjowany"
-#: ../src/tags/ogg_header.c:263
+#: ../src/tags/ogg_header.c:262
msgid "Read from media returned an error"
msgstr "Odczyt z pliku multimedialnego zwrócił błąd"
-#: ../src/tags/ogg_header.c:266
+#: ../src/tags/ogg_header.c:265
msgid "Bitstream is not Vorbis data"
msgstr "Strumień bitów nie zawiera danych Vorbis"
-#: ../src/tags/ogg_header.c:269
+#: ../src/tags/ogg_header.c:268
msgid "Vorbis version mismatch"
msgstr "Niezgodność wersji Vorbis"
-#: ../src/tags/ogg_header.c:272
+#: ../src/tags/ogg_header.c:271
msgid "Invalid Vorbis bitstream header"
msgstr "Nieprawidłowy nagłówek strumienia bitów Vorbis"
-#: ../src/tags/ogg_header.c:275
+#: ../src/tags/ogg_header.c:274
msgid "Internal logic fault, indicates a bug or heap/stack corruption"
msgstr "Wewnętrzny błąd logiczny, oznacza to błąd lub uszkodzenie stosu"
-#: ../src/tags/ogg_header.c:326
+#: ../src/tags/ogg_header.c:325
#, c-format
msgid "Failed to open file as Vorbis: %s"
msgstr "Otwarcie pliku jako Vorbis się nie powiodło: %s"
-#: ../src/tags/ogg_header.c:389
+#: ../src/tags/ogg_header.c:387
msgid "Ogg Vorbis File"
msgstr "Plik Ogg Vorbis"
-#: ../src/tags/ogg_header.c:392
+#: ../src/tags/ogg_header.c:391
msgid "Speex File"
msgstr "Plik Speex"
-#: ../src/tags/opus_header.c:222
+#: ../src/tags/opus_header.c:223
msgid "Opus File"
msgstr "Plik Opus"
-#: ../src/tags/wavpack_header.c:83
+#: ../src/tags/wavpack_header.c:138
msgid "Wavpack File"
msgstr "Plik WavPack"
diff --git a/po/tr.po b/po/tr.po
index c64308c..5e83313 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,18 +8,17 @@
msgid ""
msgstr ""
"Project-Id-Version: easytag\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-11-28 21:47+0000\n"
-"PO-Revision-Date: 2014-12-13 10:21+0200\n"
-"Last-Translator: Muhammet Kara <muhammetk at gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=easytag&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-02-07 21:29+0000\n"
+"PO-Revision-Date: 2015-02-11 00:05+0200\n"
+"Last-Translator: Osman Karagöz <osmank3 at gmail.com>\n"
"Language-Team: Türkçe <gnome-turk at gnome.org>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+"X-Generator: Poedit 1.7.4\n"
#. Name and summary taken from the desktop file.
#: ../data/easytag.appdata.xml.in.h:2 ../data/easytag.desktop.in.h:1
@@ -27,42 +26,27 @@ msgid "EasyTAG"
msgstr "EasyTAG"
#: ../data/easytag.appdata.xml.in.h:3 ../data/easytag.desktop.in.h:3
-#| msgid "Edit sound file metadata"
msgid "Edit audio file metadata"
msgstr "Ses dosyası üstverilerini düzenleyin"
#: ../data/easytag.appdata.xml.in.h:4
-msgid ""
-"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
-"Vorbis, MusePack, Monkey's Audio and WavPack files."
-msgstr ""
-"MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg Vorbis, MusePack, Monkey's "
-"Audio ve WavPack dosyalarının etiketlerini görüntüleyin ve düzenleyin."
+msgid "View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg Vorbis, MusePack, Monkey's Audio and WavPack files."
+msgstr "MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg Vorbis, MusePack, Monkey's Audio ve WavPack dosyalarının etiketlerini görüntüleyin ve düzenleyin."
#: ../data/easytag.appdata.xml.in.h:5
-msgid ""
-"Look up albums in online databases, bulk edit tags, create playlists and "
-"rename a collection of files."
-msgstr ""
-"Çevrimiçi veritabanlarında albümleri arayın, etiketleri topluca düzenleyin, "
-"çalma listeleri oluşturun ve bir grup dosyayı yeniden adlandrın."
+msgid "Look up albums in online databases, bulk edit tags, create playlists and rename a collection of files."
+msgstr "Çevrimiçi veritabanlarında albümleri arayın, etiketleri topluca düzenleyin, çalma listeleri oluşturun ve bir grup dosyayı yeniden adlandrın."
#: ../data/easytag.appdata.xml.in.h:6
-msgid ""
-"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
-"Windows."
-msgstr ""
-"Basit ve hoş GTK+ arayüzü; GNU/Linux ve Windows ortamında etiketlemeyi "
-"kolaylaştırır."
+msgid "A simple and nice GTK+ interface makes tagging easier under GNU/Linux and Windows."
+msgstr "Basit ve hoş GTK+ arayüzü; GNU/Linux ve Windows ortamında etiketlemeyi kolaylaştırır."
#: ../data/easytag.desktop.in.h:2
-#| msgid "Sound File Metadata Editor"
msgid "Audio File Metadata Editor"
msgstr "Ses Dosyası Üstveri Düzenleyici"
#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
#: ../data/easytag.desktop.in.h:5
-#| msgid "mp3;tag;audio;"
msgid "mp3;tag;audio;music;"
msgstr "mp3;etiket;ses;müzik;"
@@ -73,8 +57,7 @@ msgstr "EasyTAG ile Aç"
#: ../data/easytag-nautilus.metainfo.xml.in.h:2
msgid "Open directories and audio files with EasyTAG using the context menu"
-msgstr ""
-"Bağlam menüsünü kullanarak, dizinleri ve ses dosyalarını EasyTAG ile açın"
+msgstr "Bağlam menüsünü kullanarak, dizinleri ve ses dosyalarını EasyTAG ile açın"
#: ../data/browser.ui.h:1
msgid "Browse Directory With"
@@ -85,26 +68,19 @@ msgid "Run Program"
msgstr "Program Çalıştır"
#: ../data/browser.ui.h:3
-#| msgid ""
-#| "Enter the program to run. It will receive the current directory as "
-#| "parameter."
-msgid ""
-"Enter the program to run; it will receive the current directory as a "
-"parameter"
-msgstr ""
-"Çalıştırmak için program adı girin; program bulunulan dizini parametre "
-"olarak alır"
+msgid "Enter the program to run; it will receive the current directory as a parameter"
+msgstr "Çalıştırmak için program adı girin; program bulunulan dizini parametre olarak alır"
-#: ../data/browser.ui.h:4 ../src/browser.c:3775 ../src/tag_area.c:1492
+#: ../data/browser.ui.h:4 ../src/browser.c:3794 ../src/tag_area.c:1490
msgid "_Open"
msgstr "_Aç"
#: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
#: ../src/application_window.c:324 ../src/application_window.c:338
-#: ../src/application_window.c:2686 ../src/application_window.c:2724
-#: ../src/browser.c:865 ../src/browser.c:3774 ../src/cddb_dialog.c:2303
-#: ../src/easytag.c:495 ../src/easytag.c:502 ../src/easytag.c:627
-#: ../src/playlist_dialog.c:655 ../src/tag_area.c:1490 ../src/tag_area.c:1853
+#: ../src/application_window.c:2675 ../src/application_window.c:2713
+#: ../src/browser.c:870 ../src/browser.c:3793 ../src/cddb_dialog.c:2300
+#: ../src/easytag.c:475 ../src/easytag.c:482 ../src/easytag.c:607
+#: ../src/playlist_dialog.c:668 ../src/tag_area.c:1488 ../src/tag_area.c:1836
msgid "_Cancel"
msgstr "_Vazgeç"
@@ -117,68 +93,47 @@ msgid "Open Files With"
msgstr "Dosyaları Birlikte Aç"
#: ../data/browser.ui.h:8
-#, fuzzy
-#| msgid ""
-#| "Enter the program to run. It will receive the current file as parameter."
-msgid ""
-"Enter the program to run; it will receive the current files as a parameter"
-msgstr ""
-"Çalıştırmak için program adı girin. Program şuanki dosyayı parametre olarak "
-"alır."
+msgid "Enter the program to run; it will receive the current files as a parameter"
+msgstr "Çalıştırmak için program adı girin. Program şuanki dosyaları parametre olarak alır."
#. Only directories changed
-#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:593
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:573
msgid "Rename Directory"
msgstr "Dizini Yeniden Adlandır"
#: ../data/browser.ui.h:10
-#, fuzzy
-#| msgid "User Name:"
msgid "Literal name:"
-msgstr "Kullanıcı Adı:"
+msgstr "Gerçek Adı:"
#: ../data/browser.ui.h:11 ../data/playlist_dialog.ui.h:2
msgid "Use mask:"
msgstr "Maske Kullan:"
#: ../data/browser.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:188
-#, fuzzy
-#| msgid "Unable to create setting directories"
msgid "Whether to use a mask when renaming directories"
-msgstr "Ayar dizin, oluşturulamadı"
+msgstr "Dizini yeniden adlandırırken maske kullanmak için"
#: ../data/browser.ui.h:13
-#, fuzzy
-#| msgid ""
-#| "Select or type in a mask using codes (see Legend in Scanner Window) to "
-#| "rename the directory from tag fields."
-msgid ""
-"Select or type in a mask using codes (see Legend in Scanner Window) to "
-"rename the directory from tag fields"
-msgstr ""
-"Dizini yeniden adlandırmak için etiket alanlarından maske kodunu (Tarayıcı "
-"Penceresinden Maske Biçilerine bakın) seçin veya yazın"
+msgid "Select or type in a mask using codes (see Legend in Scanner Window) to rename the directory from tag fields"
+msgstr "Dizini yeniden adlandırmak için etiket alanlarından maske kodunu (Tarayıcı Penceresinden Maske Biçilerine bakın) seçin veya yazın"
#: ../data/browser.ui.h:14
msgid "Rename directory preview"
msgstr "Dizin yeniden adlandırma önizlemesix"
#: ../data/browser.ui.h:15
-#| msgid "Rename File"
msgid "_Rename"
msgstr "Yeniden adlandı_r"
#: ../data/browser.ui.h:16
-#, fuzzy
-#| msgid "Enter a directory to browse."
msgid "Choose a directory to show in the browser"
-msgstr "Gezinmek için dizin girin."
+msgstr "Gezginde göstermek için dizin seçin"
-#: ../data/browser.ui.h:17 ../src/application.c:129
+#: ../data/browser.ui.h:17 ../src/application.c:130
msgid "Select a directory to browse"
msgstr "Gezinmek için dizin seçin"
-#: ../data/browser.ui.h:18 ../src/easytag.c:1102
+#: ../data/browser.ui.h:18 ../src/easytag.c:1080
msgid "No files"
msgstr "Dosya yok"
@@ -245,7 +200,7 @@ msgstr "Yorum"
#: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71
#: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
-#: ../src/picture.c:237
+#: ../src/picture.c:214
msgid "Composer"
msgstr "Besteci"
@@ -269,37 +224,24 @@ msgid "Encoded By"
msgstr "Kodlayıcı"
#: ../data/cddb_dialog.ui.h:1
-#| msgid "Search:"
msgid "Search"
msgstr "Ara"
#: ../data/cddb_dialog.ui.h:2
-#, fuzzy
-#| msgid "Enter the words to search (separated by a space or '+')"
msgid "Enter the words to search (separated by a space or ‘+’)"
-msgstr "Aramak için kelimeleri girin (boşluk veya '+' ile ayrılır)"
+msgstr "Aramak için kelimeleri girin (boşluk veya ‘+’ ile ayrılır)"
#: ../data/cddb_dialog.ui.h:3
-#| msgid "Search:"
msgid "_Search"
msgstr "_Ara"
#: ../data/cddb_dialog.ui.h:4
-#, fuzzy
-#| msgid "Scan selected files"
msgid "Search Using Selected _Files"
-msgstr "Seçilen dosyaları tara"
+msgstr "Seçilen Dosyaları _Kullanarak Ara"
#: ../data/cddb_dialog.ui.h:5
-#, fuzzy
-#| msgid ""
-#| "Request automatically the CDDB using the selected files (the order is "
-#| "important) to generate the CddbID"
-msgid ""
-"Generate the CDDB disc ID using the selected files (the order is important)"
-msgstr ""
-"CddbID oluşturmak için seçilen dosyalarla (sıralama önemli) CDDB veritabanı "
-"isteğini otomatik olarak yap."
+msgid "Generate the CDDB disc ID using the selected files (the order is important)"
+msgstr "Seçilen dosyaları kullanarak CDDB disk ID'si oluştur (sıralama önemli)"
#: ../data/cddb_dialog.ui.h:6 ../data/toolbar.ui.h:31
msgid "Stop"
@@ -310,22 +252,19 @@ msgid "Stop the search"
msgstr "Aramayı durdur"
#: ../data/cddb_dialog.ui.h:8
-#| msgid "Manual Search"
msgid "Manual Search Options"
msgstr "Elle Arama Seçenekleri"
#: ../data/cddb_dialog.ui.h:9
-#, fuzzy
-#| msgid "CDDB Search Files…"
msgid "Search Fields"
-msgstr "Dosyaları CDDB'de Ara…"
+msgstr "Alanları Ara"
#: ../data/cddb_dialog.ui.h:12
msgid "Track Name"
msgstr "Parça Adı"
#: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91
-#: ../src/picture.c:215
+#: ../src/picture.c:192
msgid "Other"
msgstr "Diğer"
@@ -374,7 +313,6 @@ msgid "Soundtrack"
msgstr "Soundtrack"
#: ../data/cddb_dialog.ui.h:25
-#| msgid "Results:"
msgid "Results"
msgstr "Sonuçlar"
@@ -387,23 +325,16 @@ msgid "Category"
msgstr "Kategori"
#: ../data/cddb_dialog.ui.h:28
-#, fuzzy
-#| msgid ""
-#| "Select lines to 'apply' to your files list. All lines will be processed "
-#| "if no line is selected.\n"
-#| "You can also reorder lines in this list before using 'apply' button."
msgid ""
-"Select lines from which tags will be applied to your files list. All lines "
-"will be processed if no line is selected.\\nYou can also reorder lines in "
-"this list before using the ‘apply’ button"
+"Select lines from which tags will be applied to your files list. All lines will be processed if no line is selected.\\n"
+"You can also reorder lines in this list before using the ‘apply’ button"
msgstr ""
-"Dosya listenize uygulamak için satır seçin. Seçim yapılmazsa tüm satırlar "
-"işlenir.\n"
-"'Uygula' düğmesine basmadan önce tekrar sıralayabilirsiniz."
+"Dosya listenizde ilgili etikete uygulamak için satır seçin. Seçim yapılmazsa tüm satırlar işlenir.\\n"
+"‘Uygula’ düğmesine basmadan önce tekrar sıralayabilirsiniz"
#: ../data/cddb_dialog.ui.h:29
msgid "#"
-msgstr ""
+msgstr " #"
#: ../data/cddb_dialog.ui.h:30
msgid "Duration"
@@ -414,8 +345,6 @@ msgid "Select all lines"
msgstr "Tüm satırları seç"
#: ../data/cddb_dialog.ui.h:32
-#, fuzzy
-#| msgid "Invert lines selection"
msgid "Invert line selection"
msgstr "Satır seçimini tersine çevir"
@@ -424,10 +353,8 @@ msgid "Unselect all lines"
msgstr "Hiçbir satırı seçme"
#: ../data/cddb_dialog.ui.h:34 ../data/menus.ui.h:24
-#, fuzzy
-#| msgid "Fill Tag"
msgid "Fill Tags"
-msgstr "Etiketi Doldur"
+msgstr "Etiketleri Doldur"
#: ../data/cddb_dialog.ui.h:38
msgid "Track #"
@@ -442,10 +369,8 @@ msgid "Run the current scanner for each file"
msgstr "Şuanki tarayıcıyı tüm dosyalar için çalıştır"
#: ../data/cddb_dialog.ui.h:42 ../data/org.gnome.EasyTAG.gschema.xml.h:38
-msgid ""
-"Whether to run the tag scanner, with the current settings, on the CDDB "
-"results"
-msgstr ""
+msgid "Whether to run the tag scanner, with the current settings, on the CDDB results"
+msgstr "Bu ayarlarla, CDDB sonuçlarıyla, etiket tarayıcıyı çalıştırmak için"
#: ../data/cddb_dialog.ui.h:43
msgid "Match lines with the Levenshtein algorithm"
@@ -454,27 +379,25 @@ msgstr "Satırları Levenshtein algoritmasıyla eşleştir"
#: ../data/cddb_dialog.ui.h:44 ../data/preferences_dialog.ui.h:148
#: ../data/org.gnome.EasyTAG.gschema.xml.h:24
msgid "Whether to use the DLM algorithm to match CDDB results to files"
-msgstr ""
+msgstr "CDDB sonuçlarıyla dosyaları eşleştirirken DLM algoritmasını kullanmak için"
#: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
-#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:295
-#: ../src/scan_dialog.c:2259
+#: ../src/load_files_dialog.c:898 ../src/preferences_dialog.c:291
+#: ../src/scan_dialog.c:2307
msgid "_Close"
msgstr "_Kapat"
-#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2304
-#: ../src/load_files_dialog.c:896
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2301
+#: ../src/load_files_dialog.c:899
msgid "_Apply"
msgstr "Uygul_a"
#: ../data/cddb_dialog.ui.h:47
-#, fuzzy
-#| msgid "Load the selected lines or all lines (if no line selected)."
msgid "Load the selected lines or all lines (if no lines are selected)"
msgstr "Seçilen satırları veya tüm satırları (hiçbir satır seçilmemişse) yükle"
#. Default values are MPEG data.
-#: ../data/file_area.ui.h:1 ../src/et_core.c:3034 ../src/file_area.c:192
+#: ../data/file_area.ui.h:1 ../src/file_area.c:196 ../src/file.c:1359
msgid "File"
msgstr "Dosya"
@@ -485,10 +408,10 @@ msgstr "0/0:"
#. Nothing to display
#. Version changed to encoder version
#. Encoder version
-#: ../data/file_area.ui.h:3 ../src/file_area.c:193
-#: ../src/tags/flac_header.c:303 ../src/tags/monkeyaudio_header.c:89
-#: ../src/tags/musepack_header.c:93 ../src/tags/ogg_header.c:399
-#: ../src/tags/opus_header.c:225 ../src/tags/wavpack_header.c:86
+#: ../data/file_area.ui.h:3 ../src/file_area.c:197
+#: ../src/tags/flac_header.c:168 ../src/tags/monkeyaudio_header.c:88
+#: ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:399
+#: ../src/tags/opus_header.c:226 ../src/tags/wavpack_header.c:141
msgid "Encoder:"
msgstr "Kodlayıcı:"
@@ -501,8 +424,8 @@ msgid "Sample rate:"
msgstr "Örnek hızı:"
#. Mode
-#: ../data/file_area.ui.h:6 ../src/file_area.c:197
-#: ../src/tags/mpeg_header.c:248
+#: ../data/file_area.ui.h:6 ../src/file_area.c:201
+#: ../src/tags/mpeg_header.c:253
msgid "Mode:"
msgstr "Kip:"
@@ -523,12 +446,10 @@ msgid "File:"
msgstr "Dosya:"
#: ../data/load_files_dialog.ui.h:2
-#| msgid "Content of Text File"
msgid "Choose a Text File"
msgstr "Metin Dosyası Seç"
#: ../data/load_files_dialog.ui.h:3
-#| msgid " Load "
msgid "_Load"
msgstr "Yük_le "
@@ -544,23 +465,21 @@ msgstr "Seçilen satırdan önce boş satır bırak"
msgid "Delete the selected line"
msgstr "Seçilen satırı sil"
-#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:636
-#: ../src/load_files_dialog.c:739
+#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:639
+#: ../src/load_files_dialog.c:742
msgid "Delete all blank lines"
msgstr "Tüm boş satırları sil"
#: ../data/load_files_dialog.ui.h:8
-#| msgid "Move up the selected line"
msgid "Move the selected line up"
msgstr "Seçilen satırı yukarı taşı"
#: ../data/load_files_dialog.ui.h:9
-#| msgid "Move up the selected line"
msgid "Move the selected line down"
msgstr "Seçilen satırı aşağı taşı"
-#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:654
-#: ../src/load_files_dialog.c:757
+#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:657
+#: ../src/load_files_dialog.c:760
msgid "Reload"
msgstr "Yenile"
@@ -574,10 +493,8 @@ msgstr "Seçilen satır:"
#: ../data/load_files_dialog.ui.h:14
#: ../data/org.gnome.EasyTAG.gschema.xml.h:131
-#, fuzzy
-#| msgid "Run the current scanner for each file"
msgid "Whether to run the current scanner on files loaded from a text file"
-msgstr "Şuanki tarayıcıyı tüm dosyalar için çalıştır"
+msgstr "Yüklenen metin dosyasından mevcut tarayıcı ile dosyaları taramak için"
#: ../data/menus.ui.h:1
msgid "_Help"
@@ -587,7 +504,7 @@ msgstr "_Yardım"
msgid "_About"
msgstr "_Hakkında"
-#: ../data/menus.ui.h:3 ../src/application_window.c:2725
+#: ../data/menus.ui.h:3 ../src/application_window.c:2714
msgid "_Quit"
msgstr "_Çıkış"
@@ -612,14 +529,12 @@ msgid "Delete Files"
msgstr "Dosyaları Sil"
#: ../data/menus.ui.h:9
-#, fuzzy
-#| msgid "Find Files"
msgid "Undo for File"
-msgstr "Dosyaları Bul"
+msgstr "Dosya için Geri Al"
#: ../data/menus.ui.h:10
msgid "Redo for File"
-msgstr ""
+msgstr "Dosya için Yinele"
#: ../data/menus.ui.h:11 ../data/toolbar.ui.h:17
msgid "_Save Files"
@@ -638,7 +553,6 @@ msgid "_Find…"
msgstr "_Bul…"
#: ../data/menus.ui.h:15
-#| msgid "Select all"
msgid "Select All"
msgstr "Tümünü Seç"
@@ -667,32 +581,26 @@ msgid "_View"
msgstr "_Görünüm"
#: ../data/menus.ui.h:22
-#| msgid "_Show Scanner"
msgid "Show Scanner"
msgstr "Tarayıcıyı Göster"
#: ../data/menus.ui.h:23
-#| msgid "S_canner Mode"
msgid "Scanner Mode"
msgstr "Tarayıcı Kipi"
#: ../data/menus.ui.h:25
-#, fuzzy
-#| msgid "_Rename Files and Directories…"
msgid "Rename Files and Directories"
-msgstr "Dosya ve Dizinleri Yeniden _Adlandır…"
+msgstr "Dosya ve Dizinleri Yeniden Adlandır"
#: ../data/menus.ui.h:26 ../data/scan_dialog.ui.h:107
msgid "Process Fields"
msgstr "Alanları işle"
#: ../data/menus.ui.h:27 ../data/toolbar.ui.h:19
-#| msgid "Directory renamed"
msgid "Directory Tree"
msgstr "Dizin Ağacı"
#: ../data/menus.ui.h:28 ../data/toolbar.ui.h:21
-#| msgid "Artist and Album"
msgid "Artists and Albums"
msgstr "Sanatçılar ve Albümler"
@@ -849,40 +757,28 @@ msgid "Descending by duration"
msgstr "Süreye göre azalan"
#: ../data/menus.ui.h:67
-#, fuzzy
-#| msgid "Ascending by bitrate"
msgid "Ascending by bit rate"
msgstr "Bit oranına göre artan"
#: ../data/menus.ui.h:68
-#, fuzzy
-#| msgid "Descending by bitrate"
msgid "Descending by bit rate"
msgstr "Bit oranına göre azalan"
#: ../data/menus.ui.h:69
-#, fuzzy
-#| msgid "Ascending by samplerate"
msgid "Ascending by sample rate"
msgstr "Örnek oranına göre artan"
#: ../data/menus.ui.h:70
-#, fuzzy
-#| msgid "Descending by samplerate"
msgid "Descending by sample rate"
-msgstr "örnek oranına göre azalan"
+msgstr "Örnek oranına göre azalan"
#: ../data/menus.ui.h:71
-#, fuzzy
-#| msgid "_Collapse Tree"
msgid "Collapse Tree"
-msgstr "A_ğacı Genişlet"
+msgstr "Ağacı Genişlet"
#: ../data/menus.ui.h:72
-#, fuzzy
-#| msgid "_Reload Tree"
msgid "Reload Tree"
-msgstr "A_ğacı Yeniden Yükle"
+msgstr "Ağacı Yeniden Yükle"
#: ../data/menus.ui.h:73
msgid "Reload Directory"
@@ -965,10 +861,8 @@ msgid "_First File"
msgstr "_İlk Dosya"
#: ../data/menus.ui.h:93
-#, fuzzy
-#| msgid "_Previous File"
msgid "Previous File"
-msgstr "_Önceki Dosya"
+msgstr "Önceki Dosya"
#: ../data/menus.ui.h:94 ../data/toolbar.ui.h:5
msgid "_Next File"
@@ -979,69 +873,52 @@ msgid "_Last File"
msgstr "_Son Dosya"
#: ../data/menus.ui.h:96
-#, fuzzy
-#| msgid "_Home Directory"
msgid "Home Directory"
-msgstr "_Ev Dizini"
+msgstr "Ev Dizini"
#: ../data/menus.ui.h:97
-#, fuzzy
-#| msgid "_Default Directory"
msgid "Default Directory"
-msgstr "_Öntanımlı Dizin"
+msgstr "Öntanımlı Dizin"
#: ../data/menus.ui.h:98
-#, fuzzy
-#| msgid "Set _Current Path as Default"
msgid "Set Current Path as Default"
-msgstr "Bulunulan Dizini Öntan_ımlı Olarak Ayarla"
+msgstr "Bulunulan Dizini Öntanımlı Olarak Ayarla"
#: ../data/menus.ui.h:100
-#, fuzzy
-#| msgid "Browse _Subdirectories"
msgid "Browse Subdirectories"
-msgstr "A_lt Dizinleride Tara"
+msgstr "Alt Dizinleride Tara"
#: ../data/menus.ui.h:101
-#, fuzzy
-#| msgid "Invert selection"
msgid "Invert Selection"
-msgstr "Seçimi ters çevir"
+msgstr "Seçimi Ters Çevir"
#: ../data/menus.ui.h:102
msgid "CDDB Search Files…"
msgstr "Dosyaları CDDB'de Ara…"
#: ../data/menus.ui.h:103
-#, fuzzy
-#| msgid "_Find…"
msgid "Find…"
-msgstr "_Bul…"
+msgstr "Bul…"
#: ../data/menus.ui.h:104
-#, fuzzy
-#| msgid "Clear log"
msgid "Clear Log"
-msgstr "Raporu temizle"
+msgstr "Raporu Temizle"
#: ../data/playlist_dialog.ui.h:3
msgid "Use directory name"
msgstr "Dizin adı kullan"
#: ../data/playlist_dialog.ui.h:4
-#, fuzzy
-#| msgid "Log Options"
msgid "Options"
-msgstr "Günlük Seçenekleri"
+msgstr "Seçenekler"
#: ../data/playlist_dialog.ui.h:5
msgid "Include only the selected files"
msgstr "Sadece seçilen dosyaları içer"
#: ../data/playlist_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:164
-msgid ""
-"Whether to use only the selected files or all files when creating playlists"
-msgstr ""
+msgid "Whether to use only the selected files or all files when creating playlists"
+msgstr "Çalma listesi oluşturulurken seçilen dosyaları veya tüm dosyaları kullanmak için"
#: ../data/playlist_dialog.ui.h:7
msgid "Use full path for files in playlist"
@@ -1056,39 +933,30 @@ msgid "Create playlist in the parent directory"
msgstr "Çalma listesini üst dizinde oluştur"
#: ../data/playlist_dialog.ui.h:10 ../data/org.gnome.EasyTAG.gschema.xml.h:168
-#, fuzzy
-#| msgid "Create playlist in the parent directory"
msgid "Whether to create the playlist in the parent directory"
-msgstr "Çalma listesini üst dizinde oluştur"
+msgstr "Çalma listesini üst dizinde oluşturmak için"
#: ../data/playlist_dialog.ui.h:11
msgid "Use DOS directory separator"
msgstr "DOS dizin ayıracını kullan"
#: ../data/playlist_dialog.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:170
-msgid ""
-"Whether to use backslash as directory separator when generating playlists"
-msgstr ""
+msgid "Whether to use backslash as directory separator when generating playlists"
+msgstr "Çalma listesi oluştururken dizin ayıracı olarak ters bölü işaretini kullanmak için"
#: ../data/playlist_dialog.ui.h:13
-#, fuzzy
-#| msgid "Playlist Content"
msgid "Content"
-msgstr "Çalma Listesi İçeriği"
+msgstr "İçerik"
#: ../data/playlist_dialog.ui.h:14
msgid "Write only list of files"
msgstr "Sadece dosyaların listesini yaz"
#: ../data/playlist_dialog.ui.h:15
-#, fuzzy
-#| msgid "Write info using filename"
msgid "Write information using filename"
msgstr "Bilgi olarak dosya adını yaz"
#: ../data/playlist_dialog.ui.h:16
-#, fuzzy
-#| msgid "Write info using:"
msgid "Write information using:"
msgstr "Bilgi olarak bunu yaz:"
@@ -1097,53 +965,37 @@ msgid "Browser"
msgstr "Gezgin"
#: ../data/preferences_dialog.ui.h:2
-#, fuzzy
-#| msgid "_Default Directory"
msgid "Default Directory:"
-msgstr "_Öntanımlı Dizin"
+msgstr "Öntanımlı Dizin:"
#: ../data/preferences_dialog.ui.h:3 ../data/org.gnome.EasyTAG.gschema.xml.h:4
-#, fuzzy
-#| msgid "New default path for files selected"
msgid "The default path to search for music files"
-msgstr "Seçilen dosyalar için yeni öntanımlı konum"
+msgstr "Müzik dosyalarını aramak için öntanımlı dizin"
#: ../data/preferences_dialog.ui.h:4
-msgid ""
-"Load on startup the default directory or the directory passed as argument"
+msgid "Load on startup the default directory or the directory passed as argument"
msgstr "Bu dizini veya parametre olarak girilmiş dizini açılışta yükle"
#: ../data/preferences_dialog.ui.h:5 ../data/org.gnome.EasyTAG.gschema.xml.h:2
-msgid ""
-"Whether to load the default path (or the path passed as an argument) on "
-"application startup"
-msgstr ""
+msgid "Whether to load the default path (or the path passed as an argument) on application startup"
+msgstr "Uygulama başlangıcında yüklemek için dizin (veya argüman olarak geçecek dizin)"
#: ../data/preferences_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:5
msgid "Browse subdirectories"
msgstr "Alt dizinleride tara"
#: ../data/preferences_dialog.ui.h:7 ../data/org.gnome.EasyTAG.gschema.xml.h:6
-#, fuzzy
-#| msgid ""
-#| "Search subdirectories for files when reading a directory into the tree."
-msgid ""
-"Whether to search subdirectories for audio files when reading a directory in "
-"the browser"
-msgstr "Dizini okurken alt dizinleri de arar."
+msgid "Whether to search subdirectories for audio files when reading a directory in the browser"
+msgstr "Gezginde bir dizini tararken müzik dosyalarını alt dizinlerde de aramak için"
#: ../data/preferences_dialog.ui.h:8 ../data/org.gnome.EasyTAG.gschema.xml.h:9
-#, fuzzy
-#| msgid "Show subdirectories when selecting a directory"
msgid "Expand the subdirectories of the selected directory"
-msgstr "Dizin seçildiğinde alt dizinleri göster"
+msgstr "Seçilen dizinin alt dizinlerini genişlet"
#: ../data/preferences_dialog.ui.h:9
#: ../data/org.gnome.EasyTAG.gschema.xml.h:10
-msgid ""
-"Whether to expand the subdirectories of a node in the directory browser when "
-"selecting it"
-msgstr ""
+msgid "Whether to expand the subdirectories of a node in the directory browser when selecting it"
+msgstr "Dizin gezginde bir dal seçildiğinde alt dizinlerini genişletmek için"
#: ../data/preferences_dialog.ui.h:10
msgid "Search hidden directories"
@@ -1151,61 +1003,51 @@ msgstr "Gizli dizinleri ara"
#: ../data/preferences_dialog.ui.h:11
#: ../data/org.gnome.EasyTAG.gschema.xml.h:8
-#, fuzzy
-#| msgid ""
-#| "Search subdirectories for files when reading a directory into the tree."
-msgid ""
-"Whether to show hidden directories when showing a directory in the browser"
-msgstr "Dizini okurken alt dizinleri de arar."
+msgid "Whether to show hidden directories when showing a directory in the browser"
+msgstr "Gezginde dizin gösterirken gizli dosyaları göstermek için"
#: ../data/preferences_dialog.ui.h:12
#: ../data/org.gnome.EasyTAG.gschema.xml.h:53
msgid "Sort files case-sensitively"
-msgstr ""
+msgstr "Dosyaları büyük-küçük harf duyarlı olarak sırala"
#: ../data/preferences_dialog.ui.h:13
#: ../data/org.gnome.EasyTAG.gschema.xml.h:54
msgid "Whether file sorting is case-sensitive"
-msgstr ""
+msgstr "Dosyaları büyük-küçük harf duyarlı olarak sıralamak için"
#: ../data/preferences_dialog.ui.h:15
#: ../data/org.gnome.EasyTAG.gschema.xml.h:59
msgid "Show the log"
-msgstr ""
+msgstr "Günlüğü göster"
#: ../data/preferences_dialog.ui.h:16
#: ../data/org.gnome.EasyTAG.gschema.xml.h:60
-#, fuzzy
-#| msgid "Show log view in main window"
msgid "Whether to show the log in the main window"
-msgstr "Günlük görünümünü ana pencerede göster"
+msgstr "Günlüğü ana pencerede göstermek için"
#: ../data/preferences_dialog.ui.h:17
-#, fuzzy
-#| msgid "Max number of lines:"
msgid "Maximum number of lines:"
msgstr "En fazla satır sayısı:"
#: ../data/preferences_dialog.ui.h:18
#: ../data/org.gnome.EasyTAG.gschema.xml.h:58
msgid "The maximum number of lines to keep in the log"
-msgstr ""
+msgstr "Günlükte göstermek için en fazla satır sayısı"
#: ../data/preferences_dialog.ui.h:19
msgid "General"
-msgstr ""
+msgstr "Genel"
#: ../data/preferences_dialog.ui.h:20
#: ../data/org.gnome.EasyTAG.gschema.xml.h:49
msgid "Show audio file header summary"
-msgstr ""
+msgstr "Ses dosyası başlığı özeti göster"
#: ../data/preferences_dialog.ui.h:21
#: ../data/org.gnome.EasyTAG.gschema.xml.h:50
-msgid ""
-"Whether to show header information, such as bit rate and duration, for audio "
-"files"
-msgstr ""
+msgid "Whether to show header information, such as bit rate and duration, for audio files"
+msgstr "Ses dosyalarının başlık bilgilerini, bit oranı ve süre gibi, göstermek için"
#: ../data/preferences_dialog.ui.h:22
msgid "Display changed files in list using:"
@@ -1220,10 +1062,8 @@ msgid "Bold style"
msgstr "Kalın yazılı"
#: ../data/preferences_dialog.ui.h:25
-#, fuzzy
-#| msgid "User Interface"
msgid "Interface"
-msgstr "Kullanıcı Arabirimi"
+msgstr "Arabirim"
#: ../data/preferences_dialog.ui.h:26
msgid "File Settings"
@@ -1231,54 +1071,36 @@ msgstr "Dosya Ayarları"
#: ../data/preferences_dialog.ui.h:27
#: ../data/org.gnome.EasyTAG.gschema.xml.h:45
-#, fuzzy
-#| msgid "Preserve modification time of the file"
msgid "Preserve modification time when writing files"
-msgstr "Dosyanın değiştirilme zamanını koru"
+msgstr "Yazarken dosyaların değiştirilme zamanını koru"
#: ../data/preferences_dialog.ui.h:28
#: ../data/org.gnome.EasyTAG.gschema.xml.h:46
-#, fuzzy
-#| msgid "Preserve modification time of the file"
msgid "Whether to preserve the existing modification time when editing files"
-msgstr "Dosyanın değiştirilme zamanını koru"
+msgstr "Yazarken dosyanın değiştirilme zamanını korumak için"
#: ../data/preferences_dialog.ui.h:29
#: ../data/org.gnome.EasyTAG.gschema.xml.h:47
-#, fuzzy
-#| msgid "Preserve modification time of the file"
msgid "Update parent directory modification time when writing files"
-msgstr "Dosyanın değiştirilme zamanını koru"
+msgstr "Yazarken üst dizinin değiştirilme zamanını güncelle"
#: ../data/preferences_dialog.ui.h:30
#: ../data/org.gnome.EasyTAG.gschema.xml.h:48
-#, fuzzy
-#| msgid ""
-#| "Preserve the modification time (in file properties) when saving the file."
-msgid ""
-"Whether to update the modification time on the parent directory when editing "
-"files"
-msgstr ""
-"Dosya kaydedilirken değiştirilme zamanını koru (dosya özellikleri içinde)"
+msgid "Whether to update the modification time on the parent directory when editing files"
+msgstr "Yazarken üst dizinin değiştirilme zamanını güncellemek için"
#: ../data/preferences_dialog.ui.h:31
-#, fuzzy
-#| msgid "Filename"
msgid "Filenames"
-msgstr "Dosya adı"
+msgstr "Dosya adları"
#: ../data/preferences_dialog.ui.h:32
#: ../data/org.gnome.EasyTAG.gschema.xml.h:195
-#, fuzzy
-#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
msgid "Replace illegal characters when renaming"
-msgstr "Dosya adında geçersiz karakterler değiştirin (Windows ve CD-Rom için)"
+msgstr "Yeniden adlandırırken dosya adında ki geçersiz karakterler değiştirin"
#: ../data/preferences_dialog.ui.h:33
-msgid ""
-"Convert characters which cannot be represented in filenames on the FAT32/16 "
-"and Joliet filesystems (‘\\’, ‘:’, ‘;’, ‘*’, ‘?’, ‘\"’, ‘<’, ‘>’, ‘|’)"
-msgstr ""
+msgid "Convert characters which cannot be represented in filenames on the FAT32/16 and Joliet filesystems (‘\\’, ‘:’, ‘;’, ‘*’, ‘?’, ‘\"’, ‘<’, ‘>’, ‘|’)"
+msgstr "FAT32/16 ve Joilet dosya sistemlerinde temsil edilemeyen karakterleri dönüştür (‘\\’, ‘:’, ‘;’, ‘*’, ‘?’, ‘\"’, ‘<’, ‘>’, ‘|’)"
#: ../data/preferences_dialog.ui.h:34
msgid "Convert filename extension to:"
@@ -1289,179 +1111,140 @@ msgid "Lower Case"
msgstr "Küçük Harf"
#: ../data/preferences_dialog.ui.h:36
-#, fuzzy
-#| msgid "For example, the extension will be converted to '.mp3'"
msgid "For example, the extension will be converted to ‘.mp3’"
-msgstr "Örneğin uzantı '.mp3'e dönüştürülür"
+msgstr "Örneğin uzantı ‘.mp3’e dönüştürülür"
#: ../data/preferences_dialog.ui.h:37
msgid "Upper Case"
msgstr "Büyük Harf"
#: ../data/preferences_dialog.ui.h:38
-#, fuzzy
-#| msgid "For example, the extension will be converted to '.MP3'"
msgid "For example, the extension will be converted to ‘.MP3’"
-msgstr "Örneğin uzantı '.MP3'e dönüştürülür"
+msgstr "Örneğin uzantı ‘.MP3’e dönüştürülür"
#: ../data/preferences_dialog.ui.h:39
msgid "No Change"
msgstr "Değiştirme"
#: ../data/preferences_dialog.ui.h:40
-#, fuzzy
-#| msgid "The extension will not be converted"
msgid "The extension will not be modified"
-msgstr "Uzantı değiştirilmez"
+msgstr "Uzantı dönüştürülmez"
#: ../data/preferences_dialog.ui.h:41
-#, fuzzy
-#| msgid "Filename translation"
msgid "Filename Encoding"
-msgstr "Dosya adı dönüştürme"
+msgstr "Dosya Adı Kodlama"
#: ../data/preferences_dialog.ui.h:42
msgid "Try another character encoding"
msgstr "Başka bir karakter kodlaması kullan"
#: ../data/preferences_dialog.ui.h:43
-msgid ""
-"Try to use the encoding associated with your locale and if this fails, try "
-"the ISO-8859-1 character encoding"
-msgstr ""
+msgid "Try to use the encoding associated with your locale and if this fails, try the ISO-8859-1 character encoding"
+msgstr "Yerel dosya kodlamasını kullanmayı dene, eğer başarısız olursa ISO-8859-1 karakter kodlamasını kullan"
#: ../data/preferences_dialog.ui.h:44
-#, fuzzy
-#| msgid "Try another character encoding"
msgid "Transliterate characters into the system character encoding"
-msgstr "Başka bir karakter kodlaması kullan"
+msgstr "Karakterleri sistemin karakter kodlamasına benzet"
#: ../data/preferences_dialog.ui.h:45
-msgid ""
-"Replace unsupported characters with a similar character from the target "
-"character encoding"
-msgstr ""
+msgid "Replace unsupported characters with a similar character from the target character encoding"
+msgstr "Desteklenmeyen karakterleri hedef karakter kodlamasında benzeyen karakterle değiştir"
#: ../data/preferences_dialog.ui.h:46
-#, fuzzy
-#| msgid ""
-#| "Force using the system character encoding and silently discard some "
-#| "characters"
-msgid ""
-"Use the system character encoding and silently discard unsupported characters"
-msgstr "Sistem karakter kodlamasına zorla ve bazı karakterleri esgeç"
+msgid "Use the system character encoding and silently discard unsupported characters"
+msgstr "Sistem karakter kodlamasını kullan ve desteklenmeyen karakterleri esgeç"
#: ../data/preferences_dialog.ui.h:47
-#, fuzzy
-#| msgid ""
-#| "With this option, when a character cannot be represented in the target "
-#| "character set, it will be silently discarded."
-msgid ""
-"Discard characters which cannot be represented in the target character "
-"encoding"
-msgstr "Bu seçenek ile dönüştürülemeyen karakterler yazılmadan geçilir."
+msgid "Discard characters which cannot be represented in the target character encoding"
+msgstr "Hedef karakter kodlamasında temsil edilmeyen karakterleri esgeçmek için"
#: ../data/preferences_dialog.ui.h:48
-#, fuzzy
-#| msgid "File"
msgid "Files"
-msgstr "Dosya"
+msgstr "Dosyalar"
#: ../data/preferences_dialog.ui.h:49
msgid "Automatically complete date field"
-msgstr ""
+msgstr "Tarih alanını otomatik tamamla"
#: ../data/preferences_dialog.ui.h:50
#: ../data/org.gnome.EasyTAG.gschema.xml.h:94
msgid "Whether to automatically complete the date tag"
-msgstr ""
+msgstr "Tarih etiketini otomatik tamamlamak için"
#: ../data/preferences_dialog.ui.h:51
#: ../data/org.gnome.EasyTAG.gschema.xml.h:99
msgid "Automatically select the type of the image based on its filename"
-msgstr ""
+msgstr "Dosya adına göre görüntü türünü otomatik seç"
#: ../data/preferences_dialog.ui.h:52
-msgid ""
-"Whether to, when adding cover art, automatically select a type for an image "
-"based on its filename"
-msgstr ""
+msgid "Whether to, when adding cover art, automatically select a type for an image based on its filename"
+msgstr "Albüm kapağı eklerken dosya adına göre görüntü türünü otomatik seçmek için"
#: ../data/preferences_dialog.ui.h:53
#: ../data/org.gnome.EasyTAG.gschema.xml.h:105
msgid "Preserve the tag field focus"
-msgstr ""
+msgstr "Etiket alanı odağını koru"
#: ../data/preferences_dialog.ui.h:54
#: ../data/org.gnome.EasyTAG.gschema.xml.h:106
msgid "Whether to preserve focus on the current tag field when switching file"
-msgstr ""
+msgstr "Dosyayı değiştiriken mevcut etiket alanında odağı korumak için"
#: ../data/preferences_dialog.ui.h:55
msgid "Pad the number of digits in the disc field to:"
-msgstr ""
+msgstr "Disk alanı için basamak sayısı:"
#: ../data/preferences_dialog.ui.h:56
#: ../data/org.gnome.EasyTAG.gschema.xml.h:96
-#, fuzzy
-#| msgid "Whether to pad the disc field with leading zeroes"
msgid "Whether the disc number tag field should be padded with leading zeroes"
-msgstr "Disk kısımının başını hizalamak için sıfır eklenip eklenmeyeceği"
+msgstr "Disk etiketi alanını hizalarken sayının başına sıfır eklenmesi için"
#: ../data/preferences_dialog.ui.h:57
msgid "Pad the number of digits in the track field to:"
-msgstr ""
+msgstr "Parça numarası alanı için basamak sayısı:"
#: ../data/preferences_dialog.ui.h:58
#: ../data/org.gnome.EasyTAG.gschema.xml.h:102
-#, fuzzy
-#| msgid "Whether to pad the disc field with leading zeroes"
msgid "Whether the track number tag field should be padded with leading zeroes"
-msgstr "Disk kısımının başını hizalamak için sıfır eklenip eklenmeyeceği"
+msgstr "Parça numarası alanını hizalarken sayının başına sıfır eklenmesi için"
#: ../data/preferences_dialog.ui.h:59
-#, fuzzy
-#| msgid "Tag Splitting"
msgid "Splitting"
-msgstr "Etiket bölme"
+msgstr "Bölme"
#: ../data/preferences_dialog.ui.h:60
-msgid ""
-"For Vorbis tags, selected fields will be split at dashes and saved as "
-"separate tags"
-msgstr ""
-"Vorbis etiketleri için seçilen alanlar tire ile bölünüp ayrı etiketler "
-"olarak kaydedilir."
+msgid "For Vorbis tags, selected fields will be split at dashes and saved as separate tags"
+msgstr "Vorbis etiketleri için seçilen alanlar tire ile bölünüp ayrı etiketler olarak kaydedilir."
#: ../data/preferences_dialog.ui.h:62
#: ../data/org.gnome.EasyTAG.gschema.xml.h:206
msgid "Whether to split title fields at a “ - ” separator in Ogg comments"
-msgstr ""
+msgstr "Ogg yorumlarında başlık alanını “ - ” ayıracı ile ayırmak için"
#: ../data/preferences_dialog.ui.h:64
#: ../data/org.gnome.EasyTAG.gschema.xml.h:208
msgid "Whether to split artist fields at a “ - ” separator in Ogg comments"
-msgstr ""
+msgstr "Ogg yorumlarında sanatçı alanını “ - ” ayıracı ile ayırmak için"
#: ../data/preferences_dialog.ui.h:66
#: ../data/org.gnome.EasyTAG.gschema.xml.h:210
msgid "Whether to split album fields at a “ - ” separator in Ogg comments"
-msgstr ""
+msgstr "Ogg yorumlarında albüm alanını “ - ” ayıracı ile ayırmak için"
#: ../data/preferences_dialog.ui.h:68
#: ../data/org.gnome.EasyTAG.gschema.xml.h:212
msgid "Whether to split genre fields at a “ - ” separator in Ogg comments"
-msgstr ""
+msgstr "Ogg yorumlarında tür alanını “ - ” ayıracı ile ayırmak için"
#: ../data/preferences_dialog.ui.h:70
#: ../data/org.gnome.EasyTAG.gschema.xml.h:214
msgid "Whether to split comment fields at a “ - ” separator in Ogg comments"
-msgstr ""
+msgstr "Ogg yorumlarında yorum alanını “ - ” ayıracı ile ayırmak için"
#: ../data/preferences_dialog.ui.h:72
#: ../data/org.gnome.EasyTAG.gschema.xml.h:216
msgid "Whether to split composer fields at a “ - ” separator in Ogg comments"
-msgstr ""
+msgstr "Ogg yorumlarında besteci alanını “ - ” ayıracı ile ayırmak için"
#: ../data/preferences_dialog.ui.h:73
msgid "Original artist"
@@ -1469,51 +1252,40 @@ msgstr "Asıl sanatçı"
#: ../data/preferences_dialog.ui.h:74
#: ../data/org.gnome.EasyTAG.gschema.xml.h:218
-msgid ""
-"Whether to split original artist fields at a “ - ” separator in Ogg comments"
-msgstr ""
+msgid "Whether to split original artist fields at a “ - ” separator in Ogg comments"
+msgstr "Ogg yorumlarında asıl sanatçı alanını “ - ” ayıracı ile ayırmak için"
#: ../data/preferences_dialog.ui.h:75
msgid "Tags"
-msgstr ""
+msgstr "Etiketler"
#: ../data/preferences_dialog.ui.h:76
#: ../data/org.gnome.EasyTAG.gschema.xml.h:63
-#, fuzzy
-#| msgid "Strip tags if all fields are set to blank"
msgid "Strip ID3 tags if all ID3 tags are empty"
-msgstr "Eğer tüm etiket alanları boşsa etiketi kaldır"
+msgstr "Tüm ID3 etiketleri boşsa ID3 etiketlerini kaldır"
#: ../data/preferences_dialog.ui.h:77
#: ../data/org.gnome.EasyTAG.gschema.xml.h:64
-msgid ""
-"Whether to remove the ID3 tag from the audio file if all the individual tag "
-"fields are empty"
-msgstr ""
+msgid "Whether to remove the ID3 tag from the audio file if all the individual tag fields are empty"
+msgstr "Tüm etiket alanları boşsa ses dosyasından ID3 etiket alanını kaldırmak için"
#: ../data/preferences_dialog.ui.h:78
-#, fuzzy
-#| msgid "Character Set for reading ID3 tags"
msgid "Non-standard encoding for reading ID3 tags:"
-msgstr "ID3 etiketleri okumak için karakter seti"
+msgstr "ID3 etiketleri okumak için standart dışı karakter seti:"
#: ../data/preferences_dialog.ui.h:79
#: ../data/org.gnome.EasyTAG.gschema.xml.h:62
msgid "Whether to use a non-standard character encoding when reading ID3 tags"
-msgstr ""
+msgstr "ID3 etiketlerini okurken standart dışı karakterlerin kodlanmasında kullanmak için"
#: ../data/preferences_dialog.ui.h:80
#: ../data/org.gnome.EasyTAG.gschema.xml.h:72
-#, fuzzy
-#| msgid "Character Set for reading ID3 tags"
msgid "Choose the character set to be used when reading ID3v1 and ID3v2 tags"
-msgstr "ID3 etiketleri okumak için karakter seti"
+msgstr "ID3v1 ve ID3v2 etiketlerini okumak için karakter seti seçin"
#: ../data/preferences_dialog.ui.h:81
-#, fuzzy
-#| msgid "ID3v2 tags"
msgid "ID3v2"
-msgstr "ID3v2 etiketleri"
+msgstr "ID3v2"
#: ../data/preferences_dialog.ui.h:82
msgid "Write ID3v2 tag"
@@ -1522,77 +1294,57 @@ msgstr "ID3v2 etiketi yaz"
#: ../data/preferences_dialog.ui.h:83
#: ../data/org.gnome.EasyTAG.gschema.xml.h:74
msgid "Whether to write ID3v2 tags when writing ID3 tags into audio files"
-msgstr ""
+msgstr "Ses dosyalarına ID3 etiketleri yazarken ID3v2 etiketlerini kullanmak için"
#: ../data/preferences_dialog.ui.h:84
msgid "Version:"
msgstr "Sürüm:"
#: ../data/preferences_dialog.ui.h:85
-#, fuzzy
-#| msgid ""
-#| "Select the ID3v2 tag version to write:\n"
-#| " - ID3v2.3 is written using id3lib,\n"
-#| " - ID3v2.4 is written using libid3tag (recommended)."
msgid ""
"Select the ID3v2 tag version to write:\n"
" • ID3v2.3 is written using id3lib,\n"
" • ID3v2.4 is written using libid3tag (recommended)"
msgstr ""
"Yazmak için ID3v2 etiket sürümü seçin:\n"
-" - ID3v2.3 id3lib ile yazılır,\n"
-" - ID3v2.4 libid3tag ile yazılır (gerekli)."
+" • ID3v2.3 id3lib ile yazılır,\n"
+" • ID3v2.4 libid3tag ile yazılır (gerekli)"
#: ../data/preferences_dialog.ui.h:88
-#, fuzzy
-#| msgid "Try another character encoding"
msgid "Character encoding:"
-msgstr "Başka bir karakter kodlaması kullan"
+msgstr "Karakter kodlaması:"
#: ../data/preferences_dialog.ui.h:89
-#, fuzzy
-#| msgid "Unicode "
msgid "Unicode"
-msgstr "Unicode "
+msgstr "Unicode"
#: ../data/preferences_dialog.ui.h:90
-msgid ""
-"Choose the Unicode character encoding to be used when writing ID3v2 tags"
-msgstr ""
+msgid "Choose the Unicode character encoding to be used when writing ID3v2 tags"
+msgstr "ID3v2 etiketleri yazılırken Unicode karakter kodlamasını kullanmak için seçin"
#: ../data/preferences_dialog.ui.h:92
-msgid ""
-"Override the standard Unicode character encoding to be used when writing "
-"ID3v2 tags"
-msgstr ""
+msgid "Override the standard Unicode character encoding to be used when writing ID3v2 tags"
+msgstr "ID3v2 etiketleri yazılırken standart Unicode karakter kodlamasını geçersiz kılmak için"
#: ../data/preferences_dialog.ui.h:93
msgid "When encoding conversion fails:"
-msgstr ""
+msgstr "Kodlama dönüştürmede sorun çıkarsa:"
#: ../data/preferences_dialog.ui.h:94
msgid "Report error"
-msgstr ""
+msgstr "Hata bildir"
#: ../data/preferences_dialog.ui.h:95
-#, fuzzy
-#| msgid ""
-#| "With this option, when a character cannot be represented in the target "
-#| "character set, it will be silently discarded."
-msgid ""
-"Display an error message when a character cannot be represented in the "
-"target character encoding and keep the original character"
-msgstr "Bu seçenek ile dönüştürülemeyen karakterler yazılmadan geçilir."
+msgid "Display an error message when a character cannot be represented in the target character encoding and keep the original character"
+msgstr "Karakter hedef karakter kodlamasında temsil edilemiyorsa hata mesajı göster ve asıl karakteri koru"
#: ../data/preferences_dialog.ui.h:96
msgid "Transliterate"
-msgstr ""
+msgstr "Benzeştir"
#: ../data/preferences_dialog.ui.h:97
-#, fuzzy
-#| msgid "Disc"
msgid "Discard"
-msgstr "Disk"
+msgstr "Esgeç"
#: ../data/preferences_dialog.ui.h:98
msgid "Automatically convert old ID3v2 tag versions"
@@ -1600,129 +1352,97 @@ msgstr "Eski ID3v2 etiketleri otomatik dönüştür"
#: ../data/preferences_dialog.ui.h:99
#: ../data/org.gnome.EasyTAG.gschema.xml.h:78
-msgid ""
-"Whether to convert ID3 tags written against old version of the "
-"specification, such as ID3v2.2, to newer ones, such as ID3v2.3 or ID3v2.4"
-msgstr ""
+msgid "Whether to convert ID3 tags written against old version of the specification, such as ID3v2.2, to newer ones, such as ID3v2.3 or ID3v2.4"
+msgstr "Eski ID3v2.2 etiketlerini ID3v2.3 veya ID3v2.4 etiketlerine dönüştürmek için"
#: ../data/preferences_dialog.ui.h:100
-#, fuzzy
-#| msgid "Use CRC32"
msgid "Use CRC-32"
-msgstr "CRC32 kullan"
+msgstr "CRC-32 kullan"
#: ../data/preferences_dialog.ui.h:101
#: ../data/org.gnome.EasyTAG.gschema.xml.h:82
msgid "Whether to embed a CRC-32 checksum of the audio file data in ID3v2 tags"
-msgstr ""
+msgstr "CRC-32 kontrol özetini ses dosyasındaki ID3v2 etiketlerine eklemek için"
#: ../data/preferences_dialog.ui.h:102
#: ../data/org.gnome.EasyTAG.gschema.xml.h:79
-#, fuzzy
-#| msgid "Set Compression in the ID3v2 tags"
msgid "Compress data in ID3v2 tags"
-msgstr "ID3v2 etiketlerine sıkıltırma uygıla"
+msgstr "ID3v2 etiket verilerini sıkıştır"
#: ../data/preferences_dialog.ui.h:103
#: ../data/org.gnome.EasyTAG.gschema.xml.h:80
-#, fuzzy
-#| msgid "Set Compression in the ID3v2 tags"
msgid "Whether to compress data in ID3v2 tags"
-msgstr "ID3v2 etiketlerine sıkıltırma uygıla"
+msgstr "ID3v2 etiket verilerini sıkıştırmak için"
#: ../data/preferences_dialog.ui.h:104
#: ../data/org.gnome.EasyTAG.gschema.xml.h:83
msgid "Use text-only genre in ID3v2 tags"
-msgstr ""
+msgstr "ID3v2 etiketlerinde türü sadece metin olarak kullan"
#: ../data/preferences_dialog.ui.h:105
#: ../data/org.gnome.EasyTAG.gschema.xml.h:84
-msgid ""
-"Whether to use only a string, and not the integer-base ID3v1 genre field, "
-"when writing a genre field to ID3v2 tags"
-msgstr ""
+msgid "Whether to use only a string, and not the integer-base ID3v1 genre field, when writing a genre field to ID3v2 tags"
+msgstr "ID3v2 etiketi tür alanı yazılırken ID3v1 tür alanı gibi sayı tabanlı değil, sadece metin olarak kullanmak için"
#: ../data/preferences_dialog.ui.h:106
-#, fuzzy
-#| msgid "ID3v1 tags"
msgid "ID3v1"
-msgstr "ID3v1 etiketler"
+msgstr "ID3v1"
#: ../data/preferences_dialog.ui.h:107
-#, fuzzy
-#| msgid "Write ID3v1.x tag"
msgid "Write ID3v1 tag"
-msgstr "ID3v1.x etiketleri yaz"
+msgstr "ID3v1 etiketi yaz"
#: ../data/preferences_dialog.ui.h:108
#: ../data/org.gnome.EasyTAG.gschema.xml.h:66
msgid "Whether to write ID3v1 tags when writing ID3 tags into audio files"
-msgstr ""
+msgstr "Ses dosyalarına ID3 etiketleri yazarken ID3v1 etiketlerini kullanmak için"
#: ../data/preferences_dialog.ui.h:109
-#, fuzzy
-#| msgid "Character Set for writing ID3 tags"
msgid "Choose the character set to be used when writing ID3v1 tag"
-msgstr "ID3 Etiketleri için Karakter Seti"
+msgstr "ID3v1 etiketlerini yazmak için karakter seti seçin"
#: ../data/preferences_dialog.ui.h:110
-#, fuzzy
-#| msgid "ID3 Tag"
msgid "ID3 Tags"
-msgstr "ID3 Etiketi"
+msgstr "ID3 Etiketleri"
#: ../data/preferences_dialog.ui.h:111
-#, fuzzy
-#| msgid "Fill Tag Scanner - Character Conversion"
msgid "Character Conversion"
-msgstr "Etiket Doldurma Tarayıcısı - Karakter Dönüşümü"
+msgstr "Karakter Dönüşümü"
#: ../data/preferences_dialog.ui.h:112
-#, fuzzy
-#| msgid "Fill Tag"
msgid "Fill Tag Scanner"
-msgstr "Etiketi Doldur"
+msgstr "Etiket Doldurma Tarayıcısı"
#: ../data/preferences_dialog.ui.h:114
-#, fuzzy, no-c-format
-#| msgid "Convert '_' and '%20' to spaces"
+#, no-c-format
msgid "Convert underscores and ‘%20’ to spaces"
-msgstr "'_' ve '%20' metinlerini boşluğa çevir"
+msgstr "Altçizgi ve ‘%20’ metinlerini boşluğa çevir"
#: ../data/preferences_dialog.ui.h:116
-#, fuzzy, no-c-format
-#| msgid "Convert space ' ' to underscore '_'"
+#, no-c-format
msgid "Convert spaces and ‘%20’ to underscores"
-msgstr "Boşlukları ' ' alt çizgiye '_' dönüştür"
+msgstr "Boşlukları ve ‘%20’ metinlerini alt çizgiye dönüştür"
#: ../data/preferences_dialog.ui.h:117
msgid "No conversion"
-msgstr ""
+msgstr "Dönüştürme"
#: ../data/preferences_dialog.ui.h:118
-#, fuzzy
-#| msgid "Rename File and Directory"
msgid "Rename File and Directory Scanner"
-msgstr "Dosya ve Dizini Yeniden Adlandır"
+msgstr "Dosya ve Dizini Yeniden Adlandırma Tarayıcısı"
#: ../data/preferences_dialog.ui.h:119
-#, fuzzy
-#| msgid "Process Fields"
msgid "Process Fields Scanner"
-msgstr "Alanları işle"
+msgstr "Alanları İşleme Tarayıcısı"
#: ../data/preferences_dialog.ui.h:120
-#, fuzzy
-#| msgid "Capitalize the first letter of each word"
msgid "Upper-case the first letters of all words"
msgstr "Her kelimenin ilk harfini büyüt"
#: ../data/preferences_dialog.ui.h:121
#: ../data/org.gnome.EasyTAG.gschema.xml.h:150
-msgid ""
-"Whether to upper-case the first letter of all words, including prepositions "
-"and other short words such as “feat.”, when processing tag fields"
-msgstr ""
+msgid "Whether to upper-case the first letter of all words, including prepositions and other short words such as “feat.”, when processing tag fields"
+msgstr "Etiket alanlarını işlerken her kelimenin ilk harfini büyütmek için, ön ekler ve “feat.” gibi kelimeler de dahil"
#: ../data/preferences_dialog.ui.h:122
msgid "Fields"
@@ -1734,10 +1454,8 @@ msgstr "Etiketleri tararken alanların üzerine yaz"
#: ../data/preferences_dialog.ui.h:124
#: ../data/org.gnome.EasyTAG.gschema.xml.h:111
-msgid ""
-"Whether to overwrite the tag field values when filling tags. Otherwise, only "
-"blank tag fields will be filled"
-msgstr ""
+msgid "Whether to overwrite the tag field values when filling tags. Otherwise, only blank tag fields will be filled"
+msgstr "Etiketleri tararken alanların üzerine yazmak için. Aksi durumda sadece boş etiket alanları doldurulur"
#: ../data/preferences_dialog.ui.h:125
msgid "Set this text as default comment:"
@@ -1745,43 +1463,29 @@ msgstr "Öntanımlı yorum olarak bu yazıyı ayarla:"
#: ../data/preferences_dialog.ui.h:126
#: ../data/org.gnome.EasyTAG.gschema.xml.h:113
-msgid ""
-"Whether to set the comment tag field to the provided default value when "
-"filling tags"
-msgstr ""
+msgid "Whether to set the comment tag field to the provided default value when filling tags"
+msgstr "Etiketleri doldururken öntanımlı yorum olarak metin ayarlamak için"
#: ../data/preferences_dialog.ui.h:127
-#, fuzzy
-#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
msgid "Use CRC-32 as the default comment (for files with ID3 tags only)"
-msgstr ""
-"Öntanımlı yorum olarak CRC32 kullan (sadece ID3 etiketli dosyalar için)."
+msgstr "Öntanımlı yorum olarak CRC32 kullan (sadece ID3 etiketli dosyalar için)"
#: ../data/preferences_dialog.ui.h:128
#: ../data/org.gnome.EasyTAG.gschema.xml.h:117
-#, fuzzy
-#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
-msgid ""
-"Whether to use the CRC-32 of the audio file data as the default comment, for "
-"files with ID3 tags only"
-msgstr ""
-"Öntanımlı yorum olarak CRC32 kullan (sadece ID3 etiketli dosyalar için)."
+msgid "Whether to use the CRC-32 of the audio file data as the default comment, for files with ID3 tags only"
+msgstr "Sadece ID3 etiketli dosyalar için, öntanımlı yorum olarak CRC32 kullanmak için"
#: ../data/preferences_dialog.ui.h:129
msgid "Scanner"
msgstr "Tarayıcı"
#: ../data/preferences_dialog.ui.h:130
-#, fuzzy
-#| msgid "Automatic Search"
msgid "Automatic Search Servers"
-msgstr "Otomatik Ara"
+msgstr "Sunucuları Otomatik Ara"
#: ../data/preferences_dialog.ui.h:131
-#, fuzzy
-#| msgid "Host Name:"
msgid "Host:"
-msgstr "Sunucu Adı:"
+msgstr "Sunucu:"
#: ../data/preferences_dialog.ui.h:132
msgid "Port:"
@@ -1792,91 +1496,66 @@ msgid "CGI Path:"
msgstr "CGI Konumu:"
#: ../data/preferences_dialog.ui.h:134
-#, fuzzy
-#| msgid "Manual Search"
msgid "Manual Search Server"
-msgstr "Elle Arama"
+msgstr "Elle Sunucu Arama"
#: ../data/preferences_dialog.ui.h:135
msgid "Proxy"
-msgstr ""
+msgstr "Vekil"
#: ../data/preferences_dialog.ui.h:136
-#, fuzzy
-#| msgid "Use a proxy"
msgid "Use a proxy server"
-msgstr "Vekil kullan"
+msgstr "Vekil sunucu kullan"
#: ../data/preferences_dialog.ui.h:137
#: ../data/org.gnome.EasyTAG.gschema.xml.h:28
msgid "Whether to access remote CDDB through a proxy"
-msgstr ""
+msgstr "Vekille uzaktaki CDDB'ye bağlanmak için"
#: ../data/preferences_dialog.ui.h:138
#: ../data/org.gnome.EasyTAG.gschema.xml.h:30
msgid "Hostname for a proxy to access remote CDDB"
-msgstr ""
+msgstr "Vekille uzak CDDB'ye erişmek için sunucu adı"
#: ../data/preferences_dialog.ui.h:139
#: ../data/org.gnome.EasyTAG.gschema.xml.h:32
msgid "Port for a proxy to access remote CDDB"
-msgstr ""
+msgstr "Vekille uzak CDDB'ye erişmek için port"
#: ../data/preferences_dialog.ui.h:140
-#, fuzzy
-#| msgid "User Name:"
msgid "User:"
-msgstr "Kullanıcı Adı:"
+msgstr "Kullanıcı:"
#: ../data/preferences_dialog.ui.h:141
#: ../data/org.gnome.EasyTAG.gschema.xml.h:34
msgid "Username for a proxy to access remote CDDB"
-msgstr ""
+msgstr "Vekille uzak CDDB'ye erişmek için kullanıcı adı"
#: ../data/preferences_dialog.ui.h:142
-#, fuzzy
-#| msgid "User Password:"
msgid "Password:"
-msgstr "Kullanıcı Parolası:"
+msgstr "Parola:"
#: ../data/preferences_dialog.ui.h:143
#: ../data/org.gnome.EasyTAG.gschema.xml.h:36
msgid "Password for a proxy to access remote CDDB"
-msgstr ""
+msgstr "Vekille uzak CDDB'ye erişmek için parola"
#: ../data/preferences_dialog.ui.h:144
-#, fuzzy
-#| msgid "Results:"
msgid "Results List"
-msgstr "Sonuçlar:"
+msgstr "Sonuç Listesi"
#: ../data/preferences_dialog.ui.h:145
-#, fuzzy
-#| msgid ""
-#| "Select corresponding audio file (according position or DLM if activated "
-#| "below)"
-msgid ""
-"Select corresponding file (according to position or DLM if activated below)"
-msgstr "Eşleşen ses dosyasını seç (Eğer aktifse uygun konum veya DLM)"
+msgid "Select corresponding file (according to position or DLM if activated below)"
+msgstr "Eşleşen dosyayı seç (Eğer aktifse uygun konum veya DLM)"
#: ../data/preferences_dialog.ui.h:146
#: ../data/org.gnome.EasyTAG.gschema.xml.h:26
-msgid ""
-"Whether to select the file in the file list which matches the position in "
-"the CDDB results list"
-msgstr ""
+msgid "Whether to select the file in the file list which matches the position in the CDDB results list"
+msgstr "CDDB sonuç listesinde eşleştiği konumda dosya listesinde dosya seçmek için"
#: ../data/preferences_dialog.ui.h:147
-#, fuzzy
-#| msgid ""
-#| "Use the Levenshtein algorithm (DLM) to match lines (using title) with "
-#| "audio files (using filename)"
-msgid ""
-"Use the Levenshtein algorithm (DLM) to match results (using title) with "
-"audio files (using filename)"
-msgstr ""
-"Satırları (başlığı kullanır) ses dosyalarıyle (dosya adını kullanır) "
-"eşleştirmek için Levenshtein algoritması (DLM) kullan"
+msgid "Use the Levenshtein algorithm (DLM) to match results (using title) with audio files (using filename)"
+msgstr "Sonuçları (başlığı kullanır) ses dosyalarıyla (dosya adını kullanır) eşleştirmek için Levenshtein algoritması (DLM) kullan"
#: ../data/preferences_dialog.ui.h:149
msgid "CDDB"
@@ -1888,115 +1567,84 @@ msgstr "Doğrulama"
#: ../data/preferences_dialog.ui.h:151
#: ../data/org.gnome.EasyTAG.gschema.xml.h:118
-#, fuzzy
-#| msgid "Confirm writing of playlist"
msgid "Confirm before quitting the application"
-msgstr "Çalma listesi oluşturulurken doğrulama iste"
+msgstr "Uygulama kapatılırken doğrulama iste"
#: ../data/preferences_dialog.ui.h:152
#: ../data/org.gnome.EasyTAG.gschema.xml.h:119
-msgid ""
-"Whether to ask for confirmation from the user before quitting the application"
-msgstr ""
+msgid "Whether to ask for confirmation from the user before quitting the application"
+msgstr "Uygulamayı kapatmadan önce doğrulama istemesi için"
#: ../data/preferences_dialog.ui.h:153
#: ../data/org.gnome.EasyTAG.gschema.xml.h:120
-#, fuzzy
-#| msgid "Confirm writing of file tag"
msgid "Confirm before writing tags"
-msgstr "Dosya etiketi yazarken doğrulama iste"
+msgstr "Etiketleri yazarken doğrulama iste"
#: ../data/preferences_dialog.ui.h:154
#: ../data/org.gnome.EasyTAG.gschema.xml.h:121
-msgid ""
-"Whether to ask for confirmation from the user before writing tags to audio "
-"files"
-msgstr ""
+msgid "Whether to ask for confirmation from the user before writing tags to audio files"
+msgstr "Etiketleri ses dosyasına yazmadan önce doğrulama istemesi için"
#: ../data/preferences_dialog.ui.h:155
#: ../data/org.gnome.EasyTAG.gschema.xml.h:122
-#, fuzzy
-#| msgid "Confirm renaming of file"
msgid "Confirm before renaming a file"
-msgstr "Dosya yeniden adlendırırken doğrulama iste"
+msgstr "Dosya yeniden adlandırırken doğrulama iste"
#: ../data/preferences_dialog.ui.h:156
#: ../data/org.gnome.EasyTAG.gschema.xml.h:123
msgid "Whether to ask for confirmation from the user before renaming a file"
-msgstr ""
+msgstr "Dosya yeniden adlandırmadan önce doğrulama istemesi için"
#: ../data/preferences_dialog.ui.h:157
#: ../data/org.gnome.EasyTAG.gschema.xml.h:126
-#, fuzzy
-#| msgid "Confirm deleting of file"
msgid "Confirm before deleting a file"
-msgstr "Dosya silerken doğrulama iste"
+msgstr "Dosya silmeden doğrulama iste"
#: ../data/preferences_dialog.ui.h:158
#: ../data/org.gnome.EasyTAG.gschema.xml.h:127
msgid "Whether to ask for confirmation from the user before deleting a file"
-msgstr ""
+msgstr "Dosya silmeden önce doğrulama istemesi için"
#: ../data/preferences_dialog.ui.h:159
#: ../data/org.gnome.EasyTAG.gschema.xml.h:124
-#, fuzzy
-#| msgid "Confirm writing of playlist"
msgid "Confirm before writing a playlist"
msgstr "Çalma listesi oluşturulurken doğrulama iste"
#: ../data/preferences_dialog.ui.h:160
#: ../data/org.gnome.EasyTAG.gschema.xml.h:125
msgid "Whether to ask for confirmation from the user before writing a playlist"
-msgstr ""
+msgstr "Çalma listesi oluşturmadan önce doğrulama istemesi için"
#: ../data/preferences_dialog.ui.h:161
#: ../data/org.gnome.EasyTAG.gschema.xml.h:128
-#, fuzzy
-#| msgid "Confirm renaming of file"
msgid "Confirm before losing unsaved changes to files"
-msgstr "Dosya yeniden adlendırırken doğrulama iste"
+msgstr "Kaydedilmeyen değişiklikleri kaybederken doğrulama iste"
#: ../data/preferences_dialog.ui.h:162
#: ../data/org.gnome.EasyTAG.gschema.xml.h:129
-msgid ""
-"Whether to ask for confirmation from the user before performing an operation "
-"that would lose unsaved changes on files"
-msgstr ""
+msgid "Whether to ask for confirmation from the user before performing an operation that would lose unsaved changes on files"
+msgstr "Kaydedilmeyen değişikliklerin kaybedilmeden doğrulama istemesi için"
#: ../data/preferences_dialog.ui.h:163
-#, fuzzy
-#| msgid "Scanner Window"
msgid "Scanner Dialog"
-msgstr "Tarayıcı Penceresi"
+msgstr "Tarayıcı Diyalogu"
#: ../data/preferences_dialog.ui.h:164
-#, fuzzy
-#| msgid "Open the Scanner Window on startup"
msgid "Show the scanner dialog on startup"
-msgstr "Tarayıcı penceresini başlangıçta aç"
+msgstr "Tarayıcı diyalogunu başlangıçta aç"
#: ../data/preferences_dialog.ui.h:165
#: ../data/org.gnome.EasyTAG.gschema.xml.h:202
-#, fuzzy
-#| msgid "Open the Scanner Window on startup"
msgid "Whether to show the scanner window on application startup"
-msgstr "Tarayıcı penceresini başlangıçta aç"
+msgstr "Tarayıcı penceresini başlangıçta göstermek için"
#: ../data/preferences_dialog.ui.h:166
msgid "Application"
-msgstr ""
+msgstr "Uygulama"
#: ../data/scan_dialog.ui.h:1
-#, fuzzy
-#| msgid ""
-#| "Select or type in a mask using codes (see Legend) to parse filename and "
-#| "path. Used to fill in tag fields"
-msgid ""
-"Select or type in a mask using codes (see Legend) to parse filename and "
-"directory. Used to fill in tag fields"
-msgstr ""
-"Dosya ve dizin adı ayrıştırmak için maske biçimi yazın veya seçin. Etiket "
-"alanları doldurmak için kullanılacak"
+msgid "Select or type in a mask using codes (see Legend) to parse filename and directory. Used to fill in tag fields"
+msgstr "Dosya ve dizin adı ayrıştırmak için maske biçimi yazın veya seçin. Etiket alanları doldurmak için kullanılacak"
#: ../data/scan_dialog.ui.h:2
msgid "Fill tag preview"
@@ -2007,46 +1655,32 @@ msgid "Mask Editor"
msgstr "Maske Düzenleyici"
#: ../data/scan_dialog.ui.h:4
-#, fuzzy
-#| msgid "Create New Mask"
msgid "Create a new mask"
-msgstr "Yeni Maske Oluştur"
+msgstr "Yeni maske oluştur"
#: ../data/scan_dialog.ui.h:5
-#, fuzzy
-#| msgid "Move up the selected line"
msgid "Move the selected mask up"
-msgstr "Seçilen satırı yukarı taşı"
+msgstr "Seçilen maskeyi yukarı taşı"
#: ../data/scan_dialog.ui.h:6
-#, fuzzy
-#| msgid "Move up the selected line"
msgid "Move the selected mask down"
-msgstr "Seçilen satırı yukarı taşı"
+msgstr "Seçilen maskeyi aşağı taşı"
#: ../data/scan_dialog.ui.h:7
-#, fuzzy
-#| msgid "Delete the selected line"
msgid "Duplicate the selected mask"
-msgstr "Seçilen satırı sil"
+msgstr "Seçilen maskeyi çoğalt"
#: ../data/scan_dialog.ui.h:8
-#, fuzzy
-#| msgid "Add Default Masks"
msgid "Add default masks"
-msgstr "Öntanımlı Maskelere Ekle"
+msgstr "Öntanımlı maskelere ekle"
#: ../data/scan_dialog.ui.h:9
-#, fuzzy
-#| msgid "Move up the selected line"
msgid "Remove the selected mask"
-msgstr "Seçilen satırı yukarı taşı"
+msgstr "Seçilen maskeyi sil"
#: ../data/scan_dialog.ui.h:10
-#, fuzzy
-#| msgid "Save Masks"
msgid "Save masks"
-msgstr "Maskeleri Kaydet"
+msgstr "Maskeleri kaydet"
#: ../data/scan_dialog.ui.h:11
msgid "Legend"
@@ -2057,9 +1691,9 @@ msgstr "Maske Biçimleri"
msgid "%a: artist"
msgstr "%a: sanatçı"
+# %z programda albüm sanatçısı için ayrılmış, ama burada hem sanatçıya hem de albüm sanatçısına %a vermiş, programınki doğru olandır...
#: ../data/scan_dialog.ui.h:15
-#, fuzzy, no-c-format
-#| msgid "%z: album artist"
+#, no-c-format
msgid "%a: album artist"
msgstr "%z: albüm sanatçısı"
@@ -2109,8 +1743,7 @@ msgid "%l: number of tracks"
msgstr "%l: parça sayısı"
#: ../data/scan_dialog.ui.h:35
-#, fuzzy, no-c-format
-#| msgid "%o: orig. artist"
+#, no-c-format
msgid "%o: original artist"
msgstr "%o: asıl sanatçı"
@@ -2144,59 +1777,41 @@ msgid "Fill Tag"
msgstr "Etiketi Doldur"
#: ../data/scan_dialog.ui.h:47
-#, fuzzy
-#| msgid "Prefix mask with current path"
msgid "Prefix mask with current directory"
msgstr "Şuanki dizin için maske öncülü"
#: ../data/scan_dialog.ui.h:48
-#, fuzzy
-#| msgid ""
-#| "Select or type in a mask using codes (see Legend) to parse tag fields. "
-#| "Used to rename the file.\n"
-#| "Use / to make directories. If the first character is /, it's a absolute "
-#| "path, otherwise is relative to the old path."
msgid ""
-"Select or type in a mask using codes (see Legend) to parse tag fields. Used "
-"to rename the file.\n"
-" Use ‘/’ to make directories. If the first character is ‘/’, it is an "
-"absolute path, otherwise is relative to the old path"
+"Select or type in a mask using codes (see Legend) to parse tag fields. Used to rename the file.\n"
+" Use ‘/’ to make directories. If the first character is ‘/’, it is an absolute path, otherwise is relative to the old path"
msgstr ""
-"Etiket alanlarını ayrıştırmak için maske biçimi yazın veya seçin. Dosyayı "
-"yeniden anlandırmak için kullanılacak.\n"
-"Dizin oluşturmak için / karakterini kullanın. İlk karakter / olursa kesin "
-"konum, değilse eski konuma göre göreceli konum olur."
+"Etiket alanlarını ayrıştırmak için maske biçimi yazın veya seçin. Dosyayı yeniden anlandırmak için kullanılacak.\n"
+" Dizin oluşturmak için ‘/’ karakterini kullanın. İlk karakter ‘/’ olursa kesin konum, değilse eski konuma göre göreceli konum olur."
#: ../data/scan_dialog.ui.h:50
msgid "Rename file preview"
msgstr "Dosya adı değiştirme önizlemesi"
#. Only filename changed
-#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:602
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:582
msgid "Rename File"
msgstr "Dosyayı Yeniden Adlandır"
#: ../data/scan_dialog.ui.h:52
-#, fuzzy
-#| msgid "Fields"
msgid "Tag Fields"
-msgstr "Alanlar"
+msgstr "Etiket Alanları"
#: ../data/scan_dialog.ui.h:54
-#, fuzzy
-#| msgid "Process filename field"
msgid "Process filename"
-msgstr "Dosya adı alanını işle"
+msgstr "Dosya adını işle"
#: ../data/scan_dialog.ui.h:56
msgid "Process title field"
msgstr "Başlık alanını işle"
#: ../data/scan_dialog.ui.h:58
-#, fuzzy
-#| msgid "Process file artist field"
msgid "Process artist field"
-msgstr "Sanatçi alanını işle"
+msgstr "Sanatçı alanını işle"
#: ../data/scan_dialog.ui.h:61
msgid "Process album field"
@@ -2215,10 +1830,8 @@ msgid "Process composer field"
msgstr "Besteci alanını işle"
#: ../data/scan_dialog.ui.h:68
-#, fuzzy
-#| msgid "Orig. artist:"
msgid "Orig. Artist"
-msgstr "Asıl sanatçı:"
+msgstr "Asıl sanatçı"
#: ../data/scan_dialog.ui.h:69
msgid "Process original artist field"
@@ -2233,66 +1846,52 @@ msgid "Process URL field"
msgstr "Bağlantı alanını işle"
#: ../data/scan_dialog.ui.h:75
-#, fuzzy
-#| msgid "Process encoder name field"
msgid "Process encoded-by field"
msgstr "Kodlayıcı alanını işle"
#: ../data/scan_dialog.ui.h:76
-#, fuzzy
-#| msgid "Capitalize all"
msgid "Capitalization"
-msgstr "Tümü Büyük Harf"
+msgstr "Büyük harf kullanımı"
#: ../data/scan_dialog.ui.h:77
msgid "Capitalize all"
-msgstr "Tümü Büyük Harf"
+msgstr "Tümü büyük harf"
#: ../data/scan_dialog.ui.h:78 ../data/org.gnome.EasyTAG.gschema.xml.h:144
-msgid ""
-"Whether to upper-case all characters of the tag when processing tag fields"
-msgstr ""
+msgid "Whether to upper-case all characters of the tag when processing tag fields"
+msgstr "Etiket alanları işlenirlen tüm harfleri büyütmek için"
#: ../data/scan_dialog.ui.h:79
msgid "Lowercase all"
-msgstr "Tümü Küçük Harf"
+msgstr "Tümü küçük harf"
#: ../data/scan_dialog.ui.h:80 ../data/org.gnome.EasyTAG.gschema.xml.h:142
-msgid ""
-"Whether to lower-case all characters of the tag when processing tag fields"
-msgstr ""
+msgid "Whether to lower-case all characters of the tag when processing tag fields"
+msgstr "Etiket alanları işlenirlen tüm harfleri küçültmek için"
#: ../data/scan_dialog.ui.h:81
msgid "Capitalize first letter"
msgstr "İlk harfi büyüt"
#: ../data/scan_dialog.ui.h:82 ../data/org.gnome.EasyTAG.gschema.xml.h:146
-msgid ""
-"Whether to upper-case the first letter of the tag when processing tag fields"
-msgstr ""
+msgid "Whether to upper-case the first letter of the tag when processing tag fields"
+msgstr "Etiket alanları işlenirlen sadece ilk kelimenin ilk harfini büyütmek için"
#: ../data/scan_dialog.ui.h:83
msgid "Capitalize the first letter of each word"
msgstr "Her kelimenin ilk harfini büyüt"
#: ../data/scan_dialog.ui.h:84 ../data/org.gnome.EasyTAG.gschema.xml.h:148
-#, fuzzy
-#| msgid ""
-#| "Don't uppercase first letter of words for some prepositions and articles."
-msgid ""
-"Whether to upper-case the first letter of each word when processing tag "
-"fields"
-msgstr "Bazı edatlar ve yazılar için kelimelerin ilk harfini büyük harf yapma."
+msgid "Whether to upper-case the first letter of each word when processing tag fields"
+msgstr "Etiket alanları işlenirken her kelimenin ilk harfini büyütmek için"
#: ../data/scan_dialog.ui.h:85
msgid "Detect Roman numerals"
msgstr "Roma rakamlarını algıla"
#: ../data/scan_dialog.ui.h:86 ../data/org.gnome.EasyTAG.gschema.xml.h:152
-msgid ""
-"Whether to detect Roman numerals when applying upper-case conversions while "
-"processing tag fields"
-msgstr ""
+msgid "Whether to detect Roman numerals when applying upper-case conversions while processing tag fields"
+msgstr "Etiket alanları işlenirken harf büyütme sırasında roma rakamlarını algılaması için"
#: ../data/scan_dialog.ui.h:87
msgid "Do not change capitalization"
@@ -2300,94 +1899,66 @@ msgstr "Büyük-küçük harfleri değiştirme"
#: ../data/scan_dialog.ui.h:88
msgid "Spaces Conversions"
-msgstr ""
+msgstr "Boşluk Dönüşümü"
#: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153
-#: ../src/tag_area.c:875
+#: ../src/tag_area.c:878
msgid "Remove spaces"
msgstr "Boşlukları sil"
#: ../data/scan_dialog.ui.h:90 ../data/org.gnome.EasyTAG.gschema.xml.h:154
msgid "Whether to remove all spaces when processing tag fields"
-msgstr ""
+msgstr "Etiket alanlarını işlerken tüm boşlukları silmek için"
#: ../data/scan_dialog.ui.h:91
msgid "Insert a space before uppercase letters"
msgstr "Büyük harflerden önce bir boşluk ekle"
#: ../data/scan_dialog.ui.h:92 ../data/org.gnome.EasyTAG.gschema.xml.h:156
-msgid ""
-"Whether to insert spaces before capital letters when processing tag fields"
-msgstr ""
+msgid "Whether to insert spaces before capital letters when processing tag fields"
+msgstr "Etiket alanlarını işlerken büyük harflerden önce boşluk bırakmak için"
#: ../data/scan_dialog.ui.h:93
msgid "Remove duplicate spaces and underscores"
msgstr "Çift boşluk ve alt çizgileri sil"
#: ../data/scan_dialog.ui.h:94 ../data/org.gnome.EasyTAG.gschema.xml.h:158
-#, fuzzy
-#| msgid "Remove duplicate spaces and underscores"
-msgid ""
-"Whether to remove duplicate spaces and underscores when processing tag fields"
-msgstr "Çift boşluk ve alt çizgileri sil"
+msgid "Whether to remove duplicate spaces and underscores when processing tag fields"
+msgstr "Etiket alanlarını işlerken çift boşluk ve alt çizgileri silmek için"
#: ../data/scan_dialog.ui.h:95
msgid "Do not change word separators"
msgstr "Kelime ayraçlarını değiştirme"
#: ../data/scan_dialog.ui.h:96
-#, fuzzy
-#| msgid "Fill Tag Scanner - Character Conversion"
msgid "Character Conversions"
-msgstr "Etiket Doldurma Tarayıcısı - Karakter Dönüşümü"
+msgstr "Karakter Dönüşümü"
-#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:831
-#, fuzzy, no-c-format
-#| msgid "Convert '_' and '%20' to spaces"
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:834
+#, no-c-format
msgid "Convert ‘_’ and ‘%20’ to spaces"
-msgstr "'_' ve '%20' metinlerini boşluğa çevir"
+msgstr "‘_’ ve ‘%20’ metinlerini boşluğa çevir"
#: ../data/scan_dialog.ui.h:100
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The underscore character or the string '%20' are replaced by one space. "
-#| "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
-msgid ""
-"The underscore character or the string ‘%20’ is replaced by one space. "
-"Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"
-msgstr ""
-"'%20' metnini ve altçizgiyi boşlukla değiştir. Örnek, önce: 'Bir"
-"%20Güzel_Yazı', sonra: 'Bir Güzel Yazı'"
+#, no-c-format
+msgid "The underscore character or the string ‘%20’ is replaced by one space. Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"
+msgstr "Altçizgiyi ve ‘%20’ metnini boşlukla değiştir. Örnek, önce: ‘Bir%20Güzel_Yazı’, sonra: ‘Bir Güzel Yazı’"
-#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:837
-#, fuzzy
-#| msgid "Convert space ' ' to underscore '_'"
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:840
msgid "Convert spaces to underscores"
-msgstr "Boşlukları ' ' alt çizgiye '_' dönüştür"
+msgstr "Boşlukları alt çizgiye dönüştür"
#: ../data/scan_dialog.ui.h:102
-#, fuzzy
-#| msgid ""
-#| "The space character is replaced by one underscore character. Example, "
-#| "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
-msgid ""
-"The space character is replaced by one underscore character. Example, "
-"before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"
-msgstr ""
-"Boşluk karakterini alt çizgi ile değiştir. Örnek, önce: 'Bir Güzel Yazı', "
-"sonra: 'Bir_Güzel_Yazı'"
+msgid "The space character is replaced by one underscore character. Example, before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"
+msgstr "Boşluk karakterini alt çizgi ile değiştir. Örnek, önce: ‘Bir Güzel Yazı’, sonra: ‘Bir_Güzel_Yazı’"
#: ../data/scan_dialog.ui.h:103
msgid "Convert:"
msgstr "Dönüştür:"
#: ../data/scan_dialog.ui.h:104
-#, fuzzy
-#| msgid ""
-#| "Replace a string by another one. Note that the search is case sensitive."
msgid "Replace a string by another one. Note that the search is case sensitive"
-msgstr ""
-"Yazıyı başka biriyle yer değiştir. Bu arama büyük küçük harf duyarlıdır."
+msgstr "Yazıyı başka biriyle yer değiştir. Bu arama büyük küçük harf duyarlıdır"
#: ../data/scan_dialog.ui.h:105
msgid "to: "
@@ -2414,21 +1985,12 @@ msgid "Search:"
msgstr "Ara:"
#: ../data/search_dialog.ui.h:2
-#, fuzzy
-#| msgid ""
-#| "Type the word to search into files. Or type nothing to display all files."
-msgid ""
-"Type the text to search for in the file list, or leave the field empty to "
-"display all files"
-msgstr ""
-"Dosyalarda aramak için bir şeyler girin veya bir şey yazmayın tüm dosyalar "
-"görünsün."
+msgid "Type the text to search for in the file list, or leave the field empty to display all files"
+msgstr "Dosyalarda aramak için bir şeyler girin veya bir şey yazmayın tüm dosyalar görünsün"
#: ../data/search_dialog.ui.h:3
-#, fuzzy
-#| msgid "_Find…"
msgid "_Find"
-msgstr "_Bul…"
+msgstr "_Bul"
#: ../data/search_dialog.ui.h:4
msgid "In:"
@@ -2456,15 +2018,15 @@ msgstr "CD"
msgid "Image Type"
msgstr "Görüntü Biçimi"
-#: ../data/tag_area.ui.h:2 ../src/picture.c:297
+#: ../data/tag_area.ui.h:2 ../src/picture.c:269
msgid "Description"
msgstr "Açıklama"
#: ../data/tag_area.ui.h:4
msgid "_Accept"
-msgstr ""
+msgstr "_Uygula"
-#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3031
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3017
msgid "Tag"
msgstr "Etiket"
@@ -2517,26 +2079,16 @@ msgid "Tag selected files with this year"
msgstr "Seçilen dosyalara bu yılı etiketle"
#: ../data/tag_area.ui.h:18
-#, fuzzy
-#| msgid ""
-#| "Number selected tracks sequentially. Starts at 01 in each subdirectory."
msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory"
-msgstr "Parça numarasını otomatik doldur. Her alt dizin için 01'den başlar."
+msgstr "Parça numarasını otomatik doldur. Her alt dizin için 01'den başlar"
#: ../data/tag_area.ui.h:19
msgid "Track #:"
msgstr "Parça #:"
#: ../data/tag_area.ui.h:20
-#, fuzzy
-#| msgid ""
-#| "Set the number of files, in the same directory of the displayed file, to "
-#| "the selected tracks."
-msgid ""
-"Set the number of files, in the same directory of the displayed file, to the "
-"selected tracks"
-msgstr ""
-"Toplam parça sayısını otomatik doldur, her alt dizini kendi içinde sayar."
+msgid "Set the number of files, in the same directory of the displayed file, to the selected tracks"
+msgstr "Toplam parça sayısını otomatik doldur, her alt dizini kendi içinde sayar"
#: ../data/tag_area.ui.h:21
msgid "Tag selected files with this number of tracks"
@@ -2622,7 +2174,7 @@ msgstr "Görüntü özelliklerini düzenle"
msgid "Tag selected files with these images"
msgstr "Seçilen dosyalara bu görüntüleri etiketle"
-#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3284 ../src/tag_area.c:3287
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3270 ../src/tag_area.c:3273
msgid "Images"
msgstr "Görüntüler"
@@ -2663,36 +2215,28 @@ msgid "_Undo"
msgstr "_Geri Al"
#: ../data/toolbar.ui.h:14
-#, fuzzy
-#| msgid "Found one file"
-#| msgid_plural "Found %d files"
msgid "Undo for file"
-msgstr "%d adet dosya bulundu"
+msgstr "Dosya için geri al"
#: ../data/toolbar.ui.h:15
msgid "R_edo"
msgstr "Yin_ele"
#: ../data/toolbar.ui.h:16
-#, fuzzy
-#| msgid "Read-only file"
msgid "Redo for file"
-msgstr "Salt okunur dosya"
+msgstr "Dosya için yinele"
#: ../data/toolbar.ui.h:18
msgid "Save changes to selected files"
msgstr "Seçilen dosyalardaki değişiklikleri kaydet"
#: ../data/toolbar.ui.h:20
-#| msgid "Collapse directory tree"
msgid "Browse directory tree"
msgstr "Dizin ağacına gözat"
#: ../data/toolbar.ui.h:22
-#, fuzzy
-#| msgid "View by artist and album"
msgid "Browse artists and albums"
-msgstr "Sanatçı ve albüme göre göster"
+msgstr "Sanatçı ve albüm tarayıcı"
#: ../data/toolbar.ui.h:24
msgid "Invert file selection"
@@ -2703,12 +2247,10 @@ msgid "Search filenames and tags"
msgstr "Dosya adları ve etiketlerini ara"
#: ../data/toolbar.ui.h:27
-#, fuzzy
-#| msgid "CDD_B Search…"
msgid "CDDB Search…"
-msgstr "CDD_B Ara…"
+msgstr "CDDB Ara…"
-#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2752
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2747
msgid "CDDB Search"
msgstr "CDDB Ara"
@@ -2721,110 +2263,76 @@ msgid "Stop the current action"
msgstr "Geçerli işlemi durdur"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:1
-#, fuzzy
-#| msgid "Ready to start"
msgid "Load on startup"
-msgstr "Başlamaya hazır"
+msgstr "Başlangıçta yükle"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:3
-#, fuzzy
-#| msgid "Add Default Masks"
msgid "Default path"
-msgstr "Öntanımlı Maskelere Ekle"
+msgstr "Öntanımlı konum"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:7
-#, fuzzy
-#| msgid "Show hidden directories"
msgid "Show hidden directories while browsing"
-msgstr "Gizli dosyaları göster"
+msgstr "Taramada gizli dosyaları göster"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:11
-#, fuzzy
-#| msgid "Server Settings for Automatic Search"
msgid "CDDB server hostname for automatic search"
-msgstr "Otomatik Arama için Sunucu Ayarları"
+msgstr "Otomatik arama için CDDB sunucu adı"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:12
-#, fuzzy
-#| msgid "Server Settings for Automatic Search"
msgid "The CDDB server to use for the automatic search"
-msgstr "Otomatik Arama için Sunucu Ayarları"
+msgstr "Otomatik aramada kullanmak için CDDB sunucu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:13
-#, fuzzy
-#| msgid "Server Settings for Automatic Search"
msgid "CDDB server port for automatic search"
-msgstr "Otomatik Arama için Sunucu Ayarları"
+msgstr "Otomatik arama için CDDB sunucu portu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:14
-#, fuzzy
-#| msgid "Server Settings for Automatic Search"
msgid "The CDDB server port to use for the automatic search"
-msgstr "Otomatik Arama için Sunucu Ayarları"
+msgstr "Otomatik aramada kullanmak için CDDB sunucu portu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:15
-#, fuzzy
-#| msgid "Server Settings for Automatic Search"
msgid "CDDB server path for automatic search"
-msgstr "Otomatik Arama için Sunucu Ayarları"
+msgstr "Otomatik arama için CDDB sunucu konumu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:16
-#, fuzzy
-#| msgid "Server Settings for Automatic Search"
msgid "The CDDB server path to use for the automatic search"
-msgstr "Otomatik Arama için Sunucu Ayarları"
+msgstr "Otomatik aramada kullanmak için CDDB sunucu konumu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:17
-#, fuzzy
-#| msgid "Server Settings for Manual Search"
msgid "CDDB server hostname for manual search"
-msgstr "Elle Arama için Sunucu Ayarları"
+msgstr "Elle arama için CDDB sunucu adı"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:18
-#, fuzzy
-#| msgid "Server Settings for Manual Search"
msgid "The CDDB server to use for a manual search"
-msgstr "Elle Arama için Sunucu Ayarları"
+msgstr "Elle aramada kullanmak için CDDB sunucu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:19
-#, fuzzy
-#| msgid "Server Settings for Manual Search"
msgid "CDDB server port for manual search"
-msgstr "Elle Arama için Sunucu Ayarları"
+msgstr "Elle arama için CDDB sunucu portu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:20
-#, fuzzy
-#| msgid "Server Settings for Manual Search"
msgid "The CDDB server port to use for a manual search"
-msgstr "Elle Arama için Sunucu Ayarları"
+msgstr "Elle aramada kullanmak için CDDB sunucu portu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:21
-#, fuzzy
-#| msgid "Server Settings for Manual Search"
msgid "CDDB server path for manual search"
-msgstr "Elle Arama için Sunucu Ayarları"
+msgstr "Elle arama için CDDB sunucu konumu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:22
-#, fuzzy
-#| msgid "Server Settings for Manual Search"
msgid "The CDDB server path to use for a manual search"
-msgstr "Elle Arama için Sunucu Ayarları"
+msgstr "Elle aramada kullanmak için CDDB sunucu konumu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:23
-#, fuzzy
-#| msgid "Error while writing CDDB results to file '%s'"
msgid "Use DLM to match CDDB results to files"
-msgstr "CDDB sonuçları '%s' dosyasına yazılırken hata oluştu"
+msgstr "CDDB sonuçlarını dosyalarla eşlemek için DLM kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:25
-msgid ""
-"Select the file with the position which matches the position of the CDDB "
-"result"
-msgstr ""
+msgid "Select the file with the position which matches the position of the CDDB result"
+msgstr "CDDB sonuçlarını dosyalarla eşleştirmek için dosya konumunu kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:27
msgid "Enable proxy for remote CDDB"
-msgstr ""
+msgstr "Uzak CDDB için vekili etkinleştir"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:29
msgid "CDDB proxy hostname"
@@ -2844,543 +2352,413 @@ msgstr "CDDB vekil sunucu parolası"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:37
msgid "Run the scanner on CDDB results"
-msgstr ""
+msgstr "CDDB sonuçlarında tarayıcıyı çalıştır"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:39
msgid "The fields to use in a manual CDDB search"
-msgstr ""
+msgstr "Elle CDDB arama için kullanılacak alanlar"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:40
msgid "Which fields to search for matches of the returned CDDB results"
-msgstr ""
+msgstr "Elle CDDB aramada kullanılacak alanları seçmek için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:41
msgid "The categories to use in a CDDB search"
-msgstr ""
+msgstr "CDDB aramada kullanılacak kategoriler"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:42
msgid "Which categories to search for matches in the returned CDDB results"
-msgstr ""
+msgstr "CDDB sonuçlarından dönenlerle eşleşen kategorilerin seçimi için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:43
msgid "The tag fields to set when matching against CDDB results"
-msgstr ""
+msgstr "CDDB sonuçlarıyla karşılıklı eşleştirilirken ayarlanacak etiket alanları"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:44
-msgid ""
-"Which tag fields should be set when matching against selected files and CDDB "
-"results"
-msgstr ""
+msgid "Which tag fields should be set when matching against selected files and CDDB results"
+msgstr "CDDB sonuçlarıyla karşılıklı eşleştirilirken ayarlanmak üzere etiket alanları için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:51
-#, fuzzy
-#| msgid "Display changed files in list using:"
msgid "Show changed files in bold"
-msgstr "Listedeki değişmiş dosyaların görünümü:"
+msgstr "Değişen dosyaları kalın göster"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:52
-msgid ""
-"Whether to highlight changed files in the file list by making them bold, or "
-"alternatively by making them red"
-msgstr ""
+msgid "Whether to highlight changed files in the file list by making them bold, or alternatively by making them red"
+msgstr "Dosya listesindeki değişen dosyaları belirtmek için onları kalınlaştırmak veya alternatif olarak kırmızılaştırmak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:55
msgid "How to sort audio files in the file list"
-msgstr ""
+msgstr "Dosya listesinde dosyaların nasıl sıralanacağı"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:56
msgid "Sort files in ascending or descending order for the selected type"
-msgstr ""
+msgstr "Dosyaları seçilen türe göre artan veya azalan olarak sırala"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:57
-#, fuzzy
-#| msgid "Max number of lines:"
msgid "Number of log lines"
-msgstr "En fazla satır sayısı:"
+msgstr "Günlük satır sayısı"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:61
-#, fuzzy
-#| msgid "Character Set for reading ID3 tags"
msgid "Use a non-standard character encoding when reading ID3 tags"
-msgstr "ID3 etiketleri okumak için karakter seti"
+msgstr "ID3 etiketleri okumak için standart dışı karakter seti kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:65
-#, fuzzy
-#| msgid "Write ID3v1.x tag"
msgid "Write ID3v1 tags"
-msgstr "ID3v1.x etiketleri yaz"
+msgstr "ID3v1 etiketleri yaz"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:67
-#, fuzzy
-#| msgid "Character Set for writing ID3 tags"
msgid "The character set for writing ID3v1 tags"
-msgstr "ID3 Etiketleri için Karakter Seti"
+msgstr "ID3v1 etiketleri yazmak için karakter seti"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:68
-#, fuzzy
-#| msgid "Character Set for writing ID3 tags"
msgid "Choose the character set to be used when writing ID3v1 tags"
-msgstr "ID3 Etiketleri için Karakter Seti"
+msgstr "ID3v1 etiketleri yazmak için kullanılacak karakter setini seçin"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:69
msgid "Encoding options when writing ID3v1 tags"
-msgstr ""
+msgstr "ID3v1 etiketleri yazılırken kodlama seçenekleri"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:70
-msgid ""
-"Additional options to pass to iconv() when converting between encodings when "
-"writing ID3v1 tags"
-msgstr ""
+msgid "Additional options to pass to iconv() when converting between encodings when writing ID3v1 tags"
+msgstr "ID3v1 etiketleri yazılırken karşılıklı kodlama dönüşümünde iconv()'ye eklemek için ek seçenekler"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:71
-#, fuzzy
-#| msgid "Character Set for reading ID3 tags"
msgid "The character set for reading ID3v1 and ID3v2 tags"
-msgstr "ID3 etiketleri okumak için karakter seti"
+msgstr "ID3v1 ve ID3v2 etiketleri okumak için karakter seti"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:73
-#, fuzzy
-#| msgid "Write ID3v2 tag"
msgid "Write ID3v2 tags"
-msgstr "ID3v2 etiketi yaz"
+msgstr "ID3v2 etiketleri yaz"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:75
msgid "Enable ID3v2.4 support"
-msgstr ""
+msgstr "ID3v2.4 desteğini etkinleştir"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:76
msgid "Whether to write ID3v2.4 tags when ID3v2 support is enabled"
-msgstr ""
+msgstr "ID3v2 desteği etkinleştirilince ID3v2.4 etiketleri yazmak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:77
-#, fuzzy
-#| msgid "Automatically convert old ID3v2 tag versions"
msgid "Convert old ID3 tag versions to new ones"
-msgstr "Eski ID3v2 etiketleri otomatik dönüştür"
+msgstr "Eski ID3 etiketlerini yenilerine otomatik dönüştür"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:81
-#, fuzzy
-#| msgid "Set CRC32 in the ID3v2 tags"
msgid "Use CRC-32 in ID3v2 tags"
-msgstr "ID3v2 etiketlerini CRC32 olarak ayarla"
+msgstr "ID3v2 etiketlerinde CRC-32 kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:85
-#, fuzzy
-#| msgid "Try another character encoding"
msgid "Use Unicode character encoding in ID3v2 tags"
-msgstr "Başka bir karakter kodlaması kullan"
+msgstr "ID3v2 etiketlerinde Unicode karakter kodlamasını kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:86
-#, fuzzy
-#| msgid "Character Set for writing ID3 tags"
msgid "Whether to use a Unicode character set when writing ID3v2 tags"
-msgstr "ID3 Etiketleri için Karakter Seti"
+msgstr "ID3v2 etiketleri yazılırken Unicode karakter setini kullanmak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:87
-#, fuzzy
-#| msgid "Character Set for writing ID3 tags"
msgid "The Unicode character set for writing ID3v2 tags"
-msgstr "ID3 Etiketleri için Karakter Seti"
+msgstr "ID3v2 etiketlerinde Unicode karakter setini kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:88
-#, fuzzy
-#| msgid "Character Set for writing ID3 tags"
msgid "Choose the Unicode character set to be used when writing ID3v2 tags"
-msgstr "ID3 Etiketleri için Karakter Seti"
+msgstr "ID3v2 etiketleri yazılırken Unicode karakter setini kullanmak için seçin"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:89
-#, fuzzy
-#| msgid "Character Set for writing ID3 tags"
msgid "The character set for writing ID3v2 tags"
-msgstr "ID3 Etiketleri için Karakter Seti"
+msgstr "ID3v2 etiketleri yazmak için karakter seti"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:90
-msgid ""
-"Override the typical Unicode character set to be used when writing ID3v2 tags"
-msgstr ""
+msgid "Override the typical Unicode character set to be used when writing ID3v2 tags"
+msgstr "ID3v2 etiketleri yazılırken tipik Unicode karakter setini üzerine yazmak için kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:91
msgid "Encoding options when writing ID3v2 tags"
-msgstr ""
+msgstr "ID3v2 etiketleri yazılırken kodlama seçenekleri"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:92
-msgid ""
-"Additional options to pass to iconv() when converting between encodings when "
-"writing ID3v2 tags"
-msgstr ""
+msgid "Additional options to pass to iconv() when converting between encodings when writing ID3v2 tags"
+msgstr "ID3v2 etiketleri yazılırken karşılıklı kodlama dönüşümünde iconv()'ye eklemek için ek seçenekler"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:93
msgid "Automatically complete the date"
-msgstr ""
+msgstr "Tarihi otomatik tamamla"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:95
msgid "Pad the disc number tag field"
-msgstr ""
+msgstr "Disk numarası etiket alanını destekle"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:97
msgid "The length of the disc number field"
-msgstr ""
+msgstr "Disk numarası alanı uzunluğu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:98
-msgid ""
-"The length of the disc number field, which controls if the field is padded "
-"with leading zeroes"
-msgstr ""
+msgid "The length of the disc number field, which controls if the field is padded with leading zeroes"
+msgstr "Disk numarası alanı uzunluğu, alanın sıfırlarla desteklenmesini kontrol eder"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:100
-msgid ""
-"Whether to, when adding cover art, automatically select the type for an "
-"image based on its filename"
-msgstr ""
+msgid "Whether to, when adding cover art, automatically select the type for an image based on its filename"
+msgstr "Albüm kapağı eklerken dosya adına göre görüntü türünü otomatik seçmek için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:101
msgid "Pad the track number tag field"
-msgstr ""
+msgstr "Parça numarası etiket alanını destekle"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:103
msgid "The length of the track number field"
-msgstr ""
+msgstr "Parça numarası alanı uzunluğu"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:104
-msgid ""
-"The length of the track number field, which controls if the field is padded "
-"with leading zeroes"
-msgstr ""
+msgid "The length of the track number field, which controls if the field is padded with leading zeroes"
+msgstr "Parça numarası alanı uzunluğu, alanın sıfırlarla desteklenmesini kontrol eder"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:107
msgid "Convert spaces and underscores when filling tag fields"
-msgstr ""
+msgstr "Etiket alanlarını doldururken boşluk ve alt çizgileri dönüştür"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:109
#, no-c-format
-msgid ""
-"Whether to convert to spaces (and %20) or underscores when filling tag "
-"fields from filenames"
-msgstr ""
+msgid "Whether to convert to spaces (and %20) or underscores when filling tag fields from filenames"
+msgstr "Dosya adlarından etiket alanları doldurulurken boşlukları (ve %20) veya alt çizgileri dönüştürmek için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:110
msgid "Overwrite tag field"
-msgstr ""
+msgstr "Etiket alanının üzerine yaz"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:112
-#, fuzzy
-#| msgid "Set this text as default comment:"
msgid "Set the default comment"
-msgstr "Öntanımlı yorum olarak bu yazıyı ayarla:"
+msgstr "Öntanımlı yorumu ayarla"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:114
msgid "Default comment for filling tags"
-msgstr ""
+msgstr "Etiketleri doldurmak için öntanımlı yorum"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:115
msgid "The default comment to use when filling tags"
-msgstr ""
+msgstr "Etiketler doldurulurken kullanılacak öntanımlı yorum"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:116
-#, fuzzy
-#| msgid "Set this text as default comment:"
msgid "Use the CRC-32 as the default comment"
-msgstr "Öntanımlı yorum olarak bu yazıyı ayarla:"
+msgstr "Öntanımlı yorum olarak CRC-32 kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:130
-#, fuzzy
-#| msgid "Run the current scanner for each file"
msgid "Run the current scanner when loading filenames from a file"
-msgstr "Şuanki tarayıcıyı tüm dosyalar için çalıştır"
+msgstr "Şuanki tarayıcıyı dosya adlarını dosyadan yüklerken çalıştır"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:132
-#, fuzzy
-#| msgid "Process title field"
msgid "Process these tag fields"
-msgstr "Başlık alanını işle"
+msgstr "Bu etiket alanlarını işle"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:133
msgid "The tag fields to process when using the scanner"
-msgstr ""
+msgstr "Tarayıcıyı kullanırken işlenecek etiket alanları"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:134
-#, fuzzy
-#| msgid "Overwrite fields when scanning tags"
msgid "Convert tag fields when processing"
-msgstr "Etiketleri tararken alanların üzerine yaz"
+msgstr "İşlerken etiket alanlarını dönüştür"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:136
#, no-c-format
-msgid ""
-"Whether to convert to spaces (and %20), underscores or other characters when "
-"processing tag fields"
-msgstr ""
+msgid "Whether to convert to spaces (and %20), underscores or other characters when processing tag fields"
+msgstr "Etiket alanlarını işlerken boşlukları (ve %20) veya alt çizgileri dönüştürmek için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:137
-#, fuzzy
-#| msgid "Try another character encoding"
msgid "Convert characters in tags"
-msgstr "Başka bir karakter kodlaması kullan"
+msgstr "Etiketlerdeki karakterleri dönüştür"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:138
-msgid ""
-"Whether to convert characters of the tag from one value to another when "
-"processing tag fields"
-msgstr ""
+msgid "Whether to convert characters of the tag from one value to another when processing tag fields"
+msgstr "Etiket alanlarını işlerken bir değerden diğerine karakterlerin dönüştürülmesi için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:139
msgid "Convert the following characters when processing tag fields"
-msgstr ""
+msgstr "Etiket alanlarını işlenirken takip eden karakterleri dönüştür"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:140
-msgid ""
-"Replace any matched sequence of characters with this string when processing "
-"tag fields"
-msgstr ""
+msgid "Replace any matched sequence of characters with this string when processing tag fields"
+msgstr "Etiket alanlarını işlerken eşleşen sıralı karakterleri değiştir"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:141
-#, fuzzy
-#| msgid "Lowercase all"
msgid "Lower-case all characters"
-msgstr "Tümü Küçük Harf"
+msgstr "Bütün karakterleri küçült"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:143
msgid "Upper-case all characters"
-msgstr ""
+msgstr "Bütün karakterleri büyüt"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:145
-#, fuzzy
-#| msgid "Capitalize the first letter of each word"
msgid "Upper-case the first letter of the tag"
-msgstr "Her kelimenin ilk harfini büyüt"
+msgstr "İlk kelimenin ilk harfini büyüt"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:147
-#, fuzzy
-#| msgid "Capitalize the first letter of each word"
msgid "Upper-case the first letter of each word"
msgstr "Her kelimenin ilk harfini büyüt"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:149
msgid "Upper-case prepositions"
-msgstr ""
+msgstr "Büyük harfli ön ekler"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:151
-#, fuzzy
-#| msgid "Detect Roman numerals"
msgid "Detect roman numerals"
msgstr "Roma rakamlarını algıla"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:155
-#, fuzzy
-#| msgid "Insert space before uppercase letter"
msgid "Insert spaces before capital letters"
msgstr "Büyük harften önce boşluk ekle"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:157
-#, fuzzy
-#| msgid "Remove duplicate spaces or underscores"
msgid "Remove duplicate spaces"
-msgstr "Çift boşluk ve alt çizgileri sil"
+msgstr "Çift boşlukları sil"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:159
-#, fuzzy
-#| msgid "Playlist File Error"
msgid "Playlist filename mask"
-msgstr "Çalma Listesi Dosyası Hatası"
+msgstr "Çalma listesi dosya adı maskesi"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:160
msgid "The default filename mask to use for a new playlist"
-msgstr ""
+msgstr "Yeni çalma listesinde kullanılacak öntanımlı dosya adı maskesi"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:161
msgid "Use a filename mask when generating a playlist"
-msgstr ""
+msgstr "Çalma listesi oluşturulurken dosya adı maskesi kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:162
msgid "Whether to use a filename mask when creating playlists"
-msgstr ""
+msgstr "Çalma listesi oluşturulurken dosya adı maskesi kullanmak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:163
-#, fuzzy
-#| msgid "Create playlist in the parent directory"
msgid "Create playlists with only the selected files"
-msgstr "Çalma listesini üst dizinde oluştur"
+msgstr "Çalma listesini sadece seçilen dosyalarla oluştur"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:165
-#, fuzzy
-#| msgid "Use relative path for files in playlist"
msgid "Use relative paths when creating playlists"
-msgstr "Çalma listesinde dosyalar için göreceli konum kullan"
+msgstr "Çalma listesinde dosyalar için göreceli konumlar kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:166
-#, fuzzy
-#| msgid "Use relative path for files in playlist"
msgid "Whether to use relative paths for files when creating playlists"
-msgstr "Çalma listesinde dosyalar için göreceli konum kullan"
+msgstr "Çalma listesinde dosyalar için göreceli konumlar kullanmak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:167
-#, fuzzy
-#| msgid "Create playlist in the parent directory"
msgid "Create the playlist in the parent directory"
msgstr "Çalma listesini üst dizinde oluştur"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:169
-#, fuzzy
-#| msgid "Use full path for files in playlist"
msgid "Use DOS separators for playlists"
-msgstr "Çalma listesinde dosyalar için gerçek konum kullan"
+msgstr "Çalma listesinde DOS ayıracını kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:171
-#, fuzzy
-#| msgid "Generate a playlist"
msgid "Content of generated playlists"
-msgstr "Çalma listesi oluştur"
+msgstr "Oluşturulan çalma listesi içeriği"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:172
-msgid ""
-"Write a plain list of files, include extended information from the filename "
-"or extended information using a supplied mask"
-msgstr ""
+msgid "Write a plain list of files, include extended information from the filename or extended information using a supplied mask"
+msgstr "Dosya adından veya kullanılan maskeden ayrıntılı bilgi içeren dosya listesini yaz"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:173
msgid "Playlist default mask"
-msgstr ""
+msgstr "Çalma listesi öntanımlı maskesi"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:174
-#, fuzzy
-#| msgid "Use full path for files in playlist"
msgid "The default mask to use for files in a playlist"
-msgstr "Çalma listesinde dosyalar için gerçek konum kullan"
+msgstr "Çalma listesindeki dosyalarda kullanmak için öntanımlı maske"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:175
msgid "Search for files case-sensitively"
-msgstr ""
+msgstr "Dosyalar için büyük küçük harf duyarlı ara"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:176
msgid "Whether matches when searching for files are case-sensitive"
-msgstr ""
+msgstr "Dosyalar için büyük küçük harf duyarılı aramak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:177
-#, fuzzy
-#| msgid "Search filenames and tags"
msgid "Search in filenames"
-msgstr "Dosya adları ve etiketlerini ara"
+msgstr "Dosya adlarında ara"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:178
msgid "Perform the search on filenames"
-msgstr ""
+msgstr "Dosya adlarında aramak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:179
-#, fuzzy
-#| msgid "Searching"
msgid "Search in tags"
-msgstr "Aranıyor"
+msgstr "Etiketlerde ara"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:180
msgid "Perform the search on tags"
-msgstr ""
+msgstr "Etiketlerde aramak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:181
-#, fuzzy
-#| msgid "Error reading tags from file: '%s'"
msgid "Mask for filling tags from filenames"
-msgstr "'%s' dosyasından etiketler okunamadı"
+msgstr "Dosya adlarıdan etiketleri doldurmak için maske"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:182
-msgid ""
-"The default mask to use when automatically filling tags with information "
-"from filenames"
-msgstr ""
+msgid "The default mask to use when automatically filling tags with information from filenames"
+msgstr "Dosya adı bilgilerinden etiketleri otomatik doldururken kullanılacak öntanımlı maske"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:183
-#, fuzzy
-#| msgid "Confirm renaming of file"
msgid "Mask for renaming files"
-msgstr "Dosya yeniden adlendırırken doğrulama iste"
+msgstr "Dosyaları yeniden adlandırmak için maske"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:184
-#, fuzzy
-#| msgid "Repeat action for the remaining files"
msgid "The default mask to use when renaming files"
-msgstr "Kalan dosyalar için eylemi tekrarla"
+msgstr "Dosyaları yeniden adlandırırken kullanılacak öntanımlı maske"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:185
-#, fuzzy
-#| msgid "Unable to create setting directories"
msgid "Mask for renaming directories"
-msgstr "Ayar dizin, oluşturulamadı"
+msgstr "Dizinleri yeniden adlandırmak için maske"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:186
msgid "The default mask to use when renaming directories"
-msgstr ""
+msgstr "Dizinleri yeniden adlandırırken kullanılacak öntanımlı maske"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:187
-#, fuzzy
-#| msgid "Unable to create setting directories"
msgid "Use a mask when renaming directories"
-msgstr "Ayar dizin, oluşturulamadı"
+msgstr "Dizinleri yeniden adlandırırken maske kullan"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:189
-#, fuzzy
-#| msgid "Convert space ' ' to underscore '_'"
msgid "Convert spaces and underscores when renaming files"
-msgstr "Boşlukları ' ' alt çizgiye '_' dönüştür"
+msgstr "Dosyaları yeniden adlandırırken boşlukları ve alt çizgileri dönüştür"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:190
msgid "Whether to convert to spaces or underscores when renaming files"
-msgstr ""
+msgstr "Dosyaları yeniden adlandırırken boşlukları ve alt çizgileri dönüştürmek için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:191
msgid "How to modify filename extensions when renaming"
-msgstr ""
+msgstr "Dosya adı eklentisinin nasıl yeniden adlandırılacağı"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:192
-msgid ""
-"Change the file extension to all lower-case, all upper-case or do not change "
-"it"
-msgstr ""
+msgid "Change the file extension to all lower-case, all upper-case or do not change it"
+msgstr "Dosya eklentisini tamammı küçük harf, tamamı büyük harf yap veya değiştirme"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:193
msgid "Encoding options when renaming files"
-msgstr ""
+msgstr "Dosyaları yeniden adlandırırken kodlama seçenekleri"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:194
-msgid ""
-"If the encoding of the filename does not match the filesystem encoding, "
-"choose whether to try another encoding, approximate the filesystem encoding "
-"with transliteration or discard the offending characters"
-msgstr ""
+msgid "If the encoding of the filename does not match the filesystem encoding, choose whether to try another encoding, approximate the filesystem encoding with transliteration or discard the offending characters"
+msgstr "Eğer dosya adı kodlaması dosya sisteminin kodlamasıyla uyuşmuyorsa, dosya sistemi kodlamasına yakın bir karakterle değiştirmek veya ilgili karakteri atlamak için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:196
-#, fuzzy
-#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
-msgid ""
-"Whether to replace illegal characters in a filename when using the rename "
-"function"
-msgstr "Dosya adında geçersiz karakterler değiştirin (Windows ve CD-Rom için)"
+msgid "Whether to replace illegal characters in a filename when using the rename function"
+msgstr "Yeniden adlandırma işlevini kullanırken geçersiz karakterleri değiştirmek için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:197
-#, fuzzy
-#| msgid "Show / Hide Masks Editor"
msgid "Show the scanner mask editor"
-msgstr "Maske Düzenleyiciyi Göster / Gizle"
+msgstr "Tarayıcıda maske düzenleyiciyi göster"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:198
msgid "Whether to show the scanner mask editor in the tag scanner"
-msgstr ""
+msgstr "Etiket tarayıcıda maske düzenleyiciyi göstermek için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:199
-#, fuzzy
-#| msgid "Show scanner"
msgid "Show the scanner legend"
-msgstr "Tarayıcıyı göster"
+msgstr "Tarayıcıda maske biçimleri göster"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:200
-#, fuzzy
-#| msgid "Whether to pad the disc field with leading zeroes"
msgid "Whether to show the scanner legend in the tag scanner"
-msgstr "Disk kısımının başını hizalamak için sıfır eklenip eklenmeyeceği"
+msgstr "Tarayıcıda maske biçimleri göstermek için"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:201
-#, fuzzy
-#| msgid "Open the Scanner Window on startup"
msgid "Show the scanner window on startup"
-msgstr "Tarayıcı penceresini başlangıçta aç"
+msgstr "Tarayıcı penceresini başlangıçta göster"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:203
msgid "The scan mode"
@@ -3388,383 +2766,324 @@ msgstr "Tarama kipi"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:204
msgid "Which type of scan to show in the scanner"
-msgstr ""
+msgstr "Tarayıcıda göstermek için hangi tür tarama yapılacağı"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:205
msgid "Split Ogg title fields"
-msgstr ""
+msgstr "Ogg başlık alanını böl"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:207
msgid "Split Ogg artist fields"
-msgstr ""
+msgstr "Ogg sanatçı alanını böl"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:209
msgid "Split Ogg album fields"
-msgstr ""
+msgstr "Ogg albüm alanını böl"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:211
msgid "Split Ogg genre fields"
-msgstr ""
+msgstr "Ogg tür alanını böl"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:213
-#, fuzzy
-#| msgid "Process comment field"
msgid "Split Ogg comment fields"
-msgstr "Yorum alanını işle"
+msgstr "Ogg yorum alanını böl"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:215
-#, fuzzy
-#| msgid "Process composer field"
msgid "Split Ogg composer fields"
-msgstr "Besteci alanını işle"
+msgstr "Ogg besteci alanını böl"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:217
-#, fuzzy
-#| msgid "Process original artist field"
msgid "Split Ogg original artist fields"
-msgstr "Asıl Sanatçı alanını işle"
+msgstr "Ogg asıl sanatçı alanını böl"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:219
msgid "Page to show in the preferences dialog"
-msgstr ""
+msgstr "Seçenekler diyalogunda gösterilecek sayfa"
#: ../data/org.gnome.EasyTAG.gschema.xml.h:220
msgid "The page in the notebook of the preferences dialog"
-msgstr ""
+msgstr "Seçenekleri diyalogundaki notdefterinin içindeki sayfa"
#: ../nautilus-extension/nautilus-easytag.c:229
msgid "Open in EasyTAG"
-msgstr ""
+msgstr "EasyTAG ile aç"
#: ../nautilus-extension/nautilus-easytag.c:230
-#, fuzzy
-#| msgid "Save the selected images to files"
msgid "Open the selected directory in EasyTAG"
-msgstr "Seçilen görüntüleri dosya olarak kaydet"
+msgstr "Seçilen dizini EasyTAG ile aç"
#: ../nautilus-extension/nautilus-easytag.c:248
-#, fuzzy
-#| msgid "Include only the selected files"
msgid "Open the selected files in EasyTAG"
-msgstr "Sadece seçilen dosyaları içer"
+msgstr "Seçilen dosyaları EasyTAG ile aç"
#. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:90
+#: ../src/about.c:89
msgid "translator-credits"
msgstr ""
"Osman Karagöz <osmank3 at gmail.com>\n"
"Muhammet Kara <muhammetk at gmail.com>"
-#: ../src/about.c:100
+#: ../src/about.c:99
msgid "View and edit tags in audio files"
msgstr "Ses dosyalarının etiketlerini görüntüle ve düzenle"
-#: ../src/application.c:46
+#: ../src/application.c:47
msgid "Print the version and exit"
msgstr "Sürümü yazdır ve çık"
#. Starting messages
-#: ../src/application.c:176
-#, fuzzy, c-format
-#| msgid "Starting EasyTAG version %s (PID: %d)…"
+#: ../src/application.c:177
+#, c-format
msgid "Starting EasyTAG version %s…"
-msgstr "EasyTAG %s sürümü başlatılıyor (PID: %d)…"
+msgstr "EasyTAG %s sürümü başlatılıyor…"
-#: ../src/application.c:181
-#, fuzzy, c-format
-#| msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
+#: ../src/application.c:182
+#, c-format
msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
-msgstr "EASYTAGLANG değişkeni ayarlanmış. Dil ayarı: '%s'"
+msgstr "EASYTAGLANG değişkeni ayarlanmış. Dil ayarı: ‘%s’"
-#: ../src/application.c:186
-#, fuzzy, c-format
-#| msgid "Setting locale: '%s'"
+#: ../src/application.c:187
+#, c-format
msgid "Setting locale: ‘%s’"
-msgstr "Dil Ayarı: '%s'"
+msgstr "Dil Ayarı: ‘%s’"
-#: ../src/application.c:192
+#: ../src/application.c:193
#, c-format
msgid "System locale is ‘%s’, using ‘%s’"
-msgstr ""
+msgstr "Sistem dili ‘%s’, ‘%s’kullanılıyor"
-#: ../src/application.c:197
+#: ../src/application.c:198
msgid "Unable to create setting directories"
msgstr "Ayar dizin, oluşturulamadı"
-#: ../src/application.c:338
+#: ../src/application.c:339
#, c-format
msgid "Website: %s"
msgstr "Web sitesi: %s"
-#: ../src/application.c:347
+#: ../src/application.c:348
msgid "- Tag and rename audio files"
msgstr "- Ses dosyalarını etiketle ve adını değiştir"
-#: ../src/application.c:431 ../src/et_core.c:679
-#, fuzzy, c-format
-#| msgid "Error while querying information for file: '%s' (%s)"
+#: ../src/application.c:432 ../src/file_list.c:400
+#, c-format
msgid "Error while querying information for file ‘%s’: %s"
-msgstr "Dosya için bilgi sorgularken hata oluştu: '%s' (%s)"
+msgstr "‘%s’ dosyası için bilgi sorgularken hata oluştu: %s"
-#: ../src/application.c:495
-#, fuzzy, c-format
-#| msgid "Cannot open path '%s'"
+#: ../src/application.c:495 ../src/application.c:503
+#, c-format
msgid "Cannot open path ‘%s’"
-msgstr "'%s' konumu açılamıyor"
+msgstr "‘%s’ konumu açılamıyor"
#: ../src/application_window.c:318 ../src/application_window.c:335
-#, fuzzy, c-format
-#| msgid "Do you really want to delete the file '%s'?"
+#, c-format
msgid "Do you really want to delete the file ‘%s’?"
-msgstr "'%s' dosyasını silmek istediğinize emin misiniz?"
+msgstr "‘%s’ dosyasını silmek istediğinize emin misiniz?"
-#: ../src/application_window.c:321 ../src/easytag.c:490 ../src/easytag.c:623
+#: ../src/application_window.c:321 ../src/easytag.c:470 ../src/easytag.c:603
msgid "Repeat action for the remaining files"
msgstr "Kalan dosyalar için eylemi tekrarla"
#: ../src/application_window.c:323
msgid "_Skip"
-msgstr ""
+msgstr "_Atla"
#: ../src/application_window.c:325 ../src/application_window.c:339
-#, fuzzy
-#| msgid "Delete File"
msgid "_Delete"
-msgstr "Dosya Sil"
+msgstr "_Sil"
#: ../src/application_window.c:327 ../src/application_window.c:337
msgid "Delete File"
msgstr "Dosya Sil"
#: ../src/application_window.c:364
-#, fuzzy, c-format
-#| msgid "File '%s' deleted"
+#, c-format
msgid "File ‘%s’ deleted"
-msgstr "'%s' silindi"
+msgstr "‘%s’ silindi"
#: ../src/application_window.c:541
-#, fuzzy, c-format
-#| msgid "Cannot delete file (%s)"
+#, c-format
msgid "Cannot delete file ‘%s’"
-msgstr "Dosya silinemiyor (%s)"
+msgstr "Dosya silinemiyor ‘%s’"
-#: ../src/application_window.c:562
-#, fuzzy
-#| msgid "All files have been deleted"
+#: ../src/application_window.c:565
msgid "Some files were not deleted"
-msgstr "Bütün dosyalar silindi"
+msgstr "Bazı dosyalar silinemedi"
-#: ../src/application_window.c:564
+#: ../src/application_window.c:567
msgid "All files have been deleted"
msgstr "Bütün dosyalar silindi"
-#: ../src/application_window.c:903
+#: ../src/application_window.c:901
msgid "All tags have been removed"
msgstr "Bütün etiketler silindi"
-#: ../src/application_window.c:1507 ../src/browser.c:357 ../src/browser.c:400
-#: ../src/browser.c:434 ../src/browser.c:4711 ../src/browser.c:4785
+#: ../src/application_window.c:1505 ../src/browser.c:356 ../src/browser.c:399
+#: ../src/browser.c:433 ../src/browser.c:4732 ../src/browser.c:4807
#, c-format
msgid "Failed to launch program ‘%s’"
-msgstr ""
+msgstr "‘%s’ programı çalıştırılamadı"
#. Quit EasyTAG.
-#: ../src/application_window.c:2647
-#, fuzzy
-#| msgid "EasyTAG: Normal exit."
+#: ../src/application_window.c:2636
msgid "Normal exit"
-msgstr "EasyTAG: Normal çıkış."
+msgstr "Normal çıkış"
-#: ../src/application_window.c:2684 ../src/browser.c:860
+#: ../src/application_window.c:2673 ../src/browser.c:865
msgid "Some files have been modified but not saved"
msgstr "Bazı dosyalar değiştirildi ama kaydedilmedi"
-#: ../src/application_window.c:2685 ../src/browser.c:864 ../src/easytag.c:273
-#: ../src/easytag.c:494 ../src/easytag.c:626 ../src/easytag.c:634
-#, fuzzy
-#| msgid "Disc"
+#: ../src/application_window.c:2674 ../src/browser.c:869 ../src/easytag.c:255
+#: ../src/easytag.c:474 ../src/easytag.c:606 ../src/easytag.c:614
msgid "_Discard"
-msgstr "Disk"
+msgstr "Es_geç"
-#: ../src/application_window.c:2687 ../src/browser.c:866 ../src/easytag.c:274
-#: ../src/easytag.c:496 ../src/easytag.c:503 ../src/easytag.c:628
-#: ../src/easytag.c:635 ../src/playlist_dialog.c:656 ../src/tag_area.c:1855
-#, fuzzy
-#| msgid "Save"
+#: ../src/application_window.c:2676 ../src/browser.c:871 ../src/easytag.c:256
+#: ../src/easytag.c:476 ../src/easytag.c:483 ../src/easytag.c:608
+#: ../src/easytag.c:615 ../src/playlist_dialog.c:669 ../src/tag_area.c:1838
msgid "_Save"
-msgstr "Kaydet"
+msgstr "_Kaydet"
-#: ../src/application_window.c:2691 ../src/application_window.c:2729
-#: ../src/easytag.c:279
+#: ../src/application_window.c:2680 ../src/application_window.c:2718
+#: ../src/easytag.c:261
msgid "Quit"
msgstr "Çıkış"
-#: ../src/application_window.c:2694
+#: ../src/application_window.c:2683
msgid "Do you want to save them before quitting?"
msgstr "Çıkmadan önce kaydedilsin mi?"
-#: ../src/application_window.c:2723
+#: ../src/application_window.c:2712
msgid "Do you really want to quit?"
msgstr "Gerçekten çıkmak istiyor musunuz?"
-#: ../src/browser.c:570
-#, fuzzy
-#| msgid "Select a directory to browse"
+#: ../src/browser.c:569
msgid "New default directory selected for browser"
-msgstr "Gezinmek için dizin seçin"
+msgstr "Gezinmek için yeni öntanımlı dizin"
-#: ../src/browser.c:863
-#, fuzzy
-#| msgid "Do you want to save them before changing the directory?"
+#: ../src/browser.c:868
msgid "Do you want to save them before changing directory?"
msgstr "Dizini değiştirmeden önce değişiklikleri kaydetmek istiyor musunuz?"
-#: ../src/browser.c:870
+#: ../src/browser.c:875
msgid "Confirm Directory Change"
msgstr "Dizin Değişimini Doğrula"
-#: ../src/browser.c:2558
-#, fuzzy
-#| msgid "<All albums>"
+#: ../src/browser.c:2572
msgid "All albums"
-msgstr "<Bütün Albümler>"
+msgstr "Bütün albümler"
-#: ../src/browser.c:3811
+#: ../src/browser.c:3830
msgid "Select File"
msgstr "Dosya Seç"
-#: ../src/browser.c:3818
+#: ../src/browser.c:3837
msgid "Select Directory"
msgstr "Dizin Seç"
-#: ../src/browser.c:4201
-#, fuzzy, c-format
-#| msgid "Rename the directory '%s' to:"
+#: ../src/browser.c:4220
+#, c-format
msgid "Rename the directory ‘%s’ to:"
-msgstr "Dizini '%s' adından:"
+msgstr "Dizini ‘%s’ adından:"
-#: ../src/browser.c:4341
+#: ../src/browser.c:4360
msgid "You must type a directory name"
msgstr "Bir dizin adı yazmalısınız"
-#: ../src/browser.c:4342 ../src/browser.c:4364
+#: ../src/browser.c:4361 ../src/browser.c:4383
msgid "Directory Name Error"
msgstr "Dizin Adı Hatası"
-#: ../src/browser.c:4360
-#, fuzzy, c-format
-#| msgid "Could not convert '%s' into filename encoding."
+#: ../src/browser.c:4379
+#, c-format
msgid "Could not convert ‘%s’ into filename encoding"
-msgstr "Dosya kodlanırken '%s' dönüştürülemedi."
+msgstr "Dosya kodlanırken ‘%s’ dönüştürülemedi"
-#: ../src/browser.c:4363
-#, fuzzy
-#| msgid "Please use another name"
+#: ../src/browser.c:4382
msgid "Please use another name."
-msgstr "Lütfen başka bir ad kullanın"
+msgstr "Lütfen başka bir ad kullanın."
-#: ../src/browser.c:4434
-#, fuzzy, c-format
-#| msgid "The directory name '%s' already exists"
+#: ../src/browser.c:4454
+#, c-format
msgid "The directory name ‘%s’ already exists."
-msgstr "\"%s\" adında bir dizin zaten var"
+msgstr "‘%s’ adında bir dizin zaten var."
-#: ../src/browser.c:4435 ../src/easytag.c:683
+#: ../src/browser.c:4455 ../src/easytag.c:661
msgid "Rename File Error"
msgstr "Dosya Yeniden Adlandırma Hatası"
-#: ../src/browser.c:4473 ../src/browser.c:4502
+#: ../src/browser.c:4493 ../src/browser.c:4522
msgid "Rename Directory Error"
msgstr "Dizin Yeniden Adlandırma Hatası"
-#: ../src/browser.c:4541
+#: ../src/browser.c:4562
msgid "Directory renamed"
msgstr "Dizin yeniden adlandırıldı"
-#: ../src/browser.c:4703 ../src/browser.c:4777
-#, fuzzy, c-format
-#| msgid "Executed command: %s"
+#: ../src/browser.c:4724 ../src/browser.c:4799
+#, c-format
msgid "Executed command ‘%s’"
-msgstr "Komutu çalıştır: %s"
+msgstr "Komutu çalıştır ‘%s’"
-#: ../src/cddb_dialog.c:271
-#, fuzzy, c-format
-#| msgid ""
-#| "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
-msgid ""
-"Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: "
-"‘%s’"
-msgstr ""
-"Albüm: '%s', sanatçı: '%s', uzunluk: '%s', yıl: '%s', tür: '%s', ID: '%s'"
+#: ../src/cddb_dialog.c:270
+#, c-format
+msgid "Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: ‘%s’"
+msgstr "Albüm: ‘%s’, sanatçı: ‘%s’, uzunluk: ‘%s’, yıl: ‘%s’, tür: ‘%s’, disk ID: ‘%s’"
-#: ../src/cddb_dialog.c:587
+#: ../src/cddb_dialog.c:586
#, c-format
msgid "Resolving host '%s'…"
msgstr "Sunucu '%s' çözülüyor…"
-#: ../src/cddb_dialog.c:629
-#, fuzzy, c-format
-#| msgid "Cannot create a new socket (%s)"
+#: ../src/cddb_dialog.c:628
+#, c-format
msgid "Cannot create a new socket ‘%s’"
-msgstr "Yeni soket oluşturulamıyor (%s)"
+msgstr "Yeni soket oluşturulamıyor ‘%s’"
-#: ../src/cddb_dialog.c:643
+#: ../src/cddb_dialog.c:642
msgid "Cannot set options on the newly-created socket"
msgstr "Yeni oluşturulmuş yuvada seçenekler ayarlanamıyor"
#. Open connection to the server.
-#: ../src/cddb_dialog.c:647
-#, fuzzy, c-format
-#| msgid "Connecting to host '%s', port '%d'…"
+#: ../src/cddb_dialog.c:646
+#, c-format
msgid "Connecting to host ‘%s’, port ‘%d’…"
-msgstr "'%s' sunucusuna '%d' portundan bağlanılıyor…"
+msgstr "‘%s’ sunucusuna ‘%d’ portundan bağlanılıyor…"
-#: ../src/cddb_dialog.c:660
-#, fuzzy, c-format
-#| msgid "Cannot connect to host '%s' (%s)"
+#: ../src/cddb_dialog.c:659
+#, c-format
msgid "Cannot connect to host ‘%s’: %s"
-msgstr "'%s' sunucusuna bağlanılamıyor (%s)"
+msgstr "‘%s’ sunucusuna bağlanılamıyor: %s"
-#: ../src/cddb_dialog.c:684
-#, fuzzy, c-format
-#| msgid "Cannot resolve host '%s' (%s)"
+#: ../src/cddb_dialog.c:683
+#, c-format
msgid "Cannot resolve host ‘%s’: %s"
-msgstr "'%s' sunucusu çözümlenemiyor (%s)."
+msgstr "‘%s’ sunucusu çözümlenemiyor: %s"
-#: ../src/cddb_dialog.c:697
-#, fuzzy, c-format
-#| msgid "Connected to host '%s'"
+#: ../src/cddb_dialog.c:696
+#, c-format
msgid "Connected to host ‘%s’"
-msgstr "'%s' sunucusuna bağlanıldı"
+msgstr "‘%s’ sunucusuna bağlanıldı"
-#: ../src/cddb_dialog.c:784
-#, fuzzy, c-format
-#| msgid "Error while writing CDDB results to file '%s'"
+#: ../src/cddb_dialog.c:783
+#, c-format
msgid "Error while writing CDDB results to file ‘%s’"
-msgstr "CDDB sonuçları '%s' dosyasına yazılırken hata oluştu"
+msgstr "CDDB sonuçları ‘%s’ dosyasına yazılırken hata oluştu"
-#: ../src/cddb_dialog.c:795
+#: ../src/cddb_dialog.c:794
#, c-format
msgid "Receiving data (%s)…"
msgstr "Veri alınıyor (%s)…"
-#: ../src/cddb_dialog.c:808
-#, fuzzy, c-format
-#| msgid "Error when reading CDDB response (%s)"
+#: ../src/cddb_dialog.c:807
+#, c-format
msgid "Error when reading CDDB response ‘%s’"
-msgstr "CDDB cevabı okunamıyor (%s)"
+msgstr "CDDB cevabı okunamıyor ‘%s’"
-#: ../src/cddb_dialog.c:815
-#, fuzzy, c-format
-#| msgid "Cannot create file '%s' (%s)"
+#: ../src/cddb_dialog.c:814
+#, c-format
msgid "Cannot create file ‘%s’: %s"
-msgstr "'%s' dosyası oluşturulamıyor (%s)"
-
-#: ../src/cddb_dialog.c:878
-#, fuzzy, c-format
-#| msgid "Can't load file: '%s' (%s)."
-msgid "Cannot load file ‘%s’: %s"
-msgstr "Dosya yüklenemiyor: '%s' (%s)."
+msgstr "‘%s’ dosyası oluşturulamıyor: %s"
#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
#. Send the request
@@ -3772,269 +3091,266 @@ msgstr "Dosya yüklenemiyor: '%s' (%s)."
#. Send the request
#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
#. Send the request
-#: ../src/cddb_dialog.c:949 ../src/cddb_dialog.c:1595
-#: ../src/cddb_dialog.c:1933
+#: ../src/cddb_dialog.c:943 ../src/cddb_dialog.c:1586
+#: ../src/cddb_dialog.c:1930
msgid "Sending request…"
msgstr "İstek gönderiliyor…"
-#: ../src/cddb_dialog.c:953 ../src/cddb_dialog.c:1599
-#: ../src/cddb_dialog.c:1937 ../src/cddb_dialog.c:3496
-#, fuzzy, c-format
-#| msgid "Cannot send the request (%s)"
+#: ../src/cddb_dialog.c:947 ../src/cddb_dialog.c:1590
+#: ../src/cddb_dialog.c:1934 ../src/cddb_dialog.c:3497
+#, c-format
msgid "Cannot send the request ‘%s’"
-msgstr "İstek gönderilemiyor (%s)"
+msgstr "İstek gönderilemiyor ‘%s’"
#. Read the answer
#.
#. * Read the answer
#.
-#: ../src/cddb_dialog.c:965 ../src/cddb_dialog.c:1626
-#: ../src/cddb_dialog.c:3514
+#: ../src/cddb_dialog.c:959 ../src/cddb_dialog.c:1617
+#: ../src/cddb_dialog.c:3515
msgid "Receiving data…"
msgstr "Veri alınıyor…"
-#: ../src/cddb_dialog.c:972 ../src/cddb_dialog.c:1633
-#: ../src/cddb_dialog.c:1968 ../src/cddb_dialog.c:3521
+#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1624
+#: ../src/cddb_dialog.c:1965 ../src/cddb_dialog.c:3522
msgid "The server returned a bad response"
msgstr "Sunucu bozuk bir yanıt döndürdü"
-#: ../src/cddb_dialog.c:988 ../src/cddb_dialog.c:1003
-#: ../src/cddb_dialog.c:1024 ../src/cddb_dialog.c:1646
-#: ../src/cddb_dialog.c:1984 ../src/cddb_dialog.c:3538
-#, fuzzy, c-format
-#| msgid "The server returned a bad response: %s"
+#: ../src/cddb_dialog.c:982 ../src/cddb_dialog.c:997 ../src/cddb_dialog.c:1018
+#: ../src/cddb_dialog.c:1637 ../src/cddb_dialog.c:1981
+#: ../src/cddb_dialog.c:3539
+#, c-format
msgid "The server returned a bad response ‘%s’"
-msgstr "Sunucu bozuk bir yanıt döndürdü: %s"
+msgstr "Sunucu bozuk bir yanıt döndürdü ‘%s’"
#. Load the track list of the album
-#: ../src/cddb_dialog.c:1239
+#: ../src/cddb_dialog.c:1230
msgid "Loading album track list…"
msgstr "Albüm parça listesi yükleniyor…"
-#: ../src/cddb_dialog.c:1793
+#: ../src/cddb_dialog.c:1784
#, c-format
msgid "Sorry, the web-based search is currently not available"
msgstr "Üzgünüm, Web tabanlı arama henüz desteklenmiyor"
-#: ../src/cddb_dialog.c:1795 ../src/cddb_dialog.c:2155
+#: ../src/cddb_dialog.c:1787 ../src/cddb_dialog.c:2152
#, c-format
msgid "Found one matching album"
-msgid_plural "Found %d matching albums"
-msgstr[0] "%d eşleşen albüm bulundu"
+msgid_plural "Found %u matching albums"
+msgstr[0] "Bir eşleşen albüm bulundu"
+msgstr[1] "%u eşleşen albüm bulundu"
-#: ../src/cddb_dialog.c:1956
+#: ../src/cddb_dialog.c:1953
#, c-format
msgid "Receiving data of page %d (album %d/%d)…"
msgstr "Verinin %d sayfası alınıyor (albüm %d/%d)…"
-#: ../src/cddb_dialog.c:1958
+#: ../src/cddb_dialog.c:1955
#, c-format
msgid "Receiving data of page %d…"
msgstr "Verinin %d sayfası alınıyor…"
-#: ../src/cddb_dialog.c:2122
+#: ../src/cddb_dialog.c:2119
#, c-format
msgid "More results to load…"
msgstr "Daha fazla sonuç yükleniyor…"
-#: ../src/cddb_dialog.c:2302
+#: ../src/cddb_dialog.c:2299
msgid "The number of CDDB results does not match the number of selected files"
msgstr "CDDB sonuç sayısı seçilen parça sayısıyla eşleşmiyor"
-#: ../src/cddb_dialog.c:2308
+#: ../src/cddb_dialog.c:2305
msgid "Write Tag from CDDB"
msgstr "Etiketleri CDDB'den Yaz"
-#: ../src/cddb_dialog.c:3012
+#: ../src/cddb_dialog.c:3007
msgid "Ready to search"
msgstr "Aramaya hazır"
-#: ../src/cddb_dialog.c:3100 ../src/load_files_dialog.c:261
-#: ../src/setting.c:245
-#, fuzzy, c-format
-#| msgid "Cannot open file '%s' (%s)"
+#: ../src/cddb_dialog.c:3098 ../src/load_files_dialog.c:261
+#: ../src/setting.c:327
+#, c-format
msgid "Cannot open file ‘%s’: %s"
-msgstr "'%s' dosyası açılamadı (%s)"
+msgstr "‘%s’ dosyası açılamıyor: %s"
-#: ../src/cddb_dialog.c:3327
+#: ../src/cddb_dialog.c:3325
#, c-format
msgid "No file selected"
msgstr "Hiç dosya seçilmedi"
#. The CD redbook standard defines the maximum number of tracks as 99, any
#. queries with more than 99 tracks will never return a result.
-#: ../src/cddb_dialog.c:3335
+#: ../src/cddb_dialog.c:3333
#, c-format
msgid "More than 99 files selected. Cannot send request"
msgstr "99 dosyadan fazlası seçildi. İstek gönderilemiyor"
-#: ../src/cddb_dialog.c:3341
+#: ../src/cddb_dialog.c:3339
#, c-format
msgid "One file selected"
-msgid_plural "%d files selected"
-msgstr[0] "%d dosya seçildi"
+msgid_plural "%u files selected"
+msgstr[0] "Bir dosya seçildi"
+msgstr[1] "%u dosya seçildi"
#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb_dialog.c:3486
-#, fuzzy, c-format
-#| msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
-msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
-msgstr "İstek gönderiliyor (CddbId: %s, #parçalar: %d, Disk uzunluğu: %d)…"
-
-#: ../src/cddb_dialog.c:3652
-#, fuzzy, c-format
-#| msgid "DiscID '%s' gave one matching album"
-#| msgid_plural "DiscID '%s' gave %d matching albums"
+#: ../src/cddb_dialog.c:3487
+#, c-format
+msgid "Sending request (disc ID: %s, #tracks: %u, Disc length: %u)…"
+msgstr "İstek gönderiliyor (disk ID: %s, #parçalar: %u, Disk uzunluğu: %u)…"
+
+#: ../src/cddb_dialog.c:3655
+#, c-format
msgid "DiscID ‘%s’ gave one matching album"
-msgid_plural "DiscID ‘%s’ gave %d matching albums"
-msgstr[0] "'%s' DiskID için %d albüm eşleşiyor"
+msgid_plural "DiscID ‘%s’ gave %u matching albums"
+msgstr[0] "‘%s’ DiskID için bir albüm eşleşiyor"
+msgstr[1] "‘%s’ DiskID için %u albüm eşleşiyor"
-#: ../src/charset.c:49
+#: ../src/charset.c:46
msgid "Arabic (IBM-864)"
msgstr "Arapça (IBM-864)"
-#: ../src/charset.c:50
+#: ../src/charset.c:47
msgid "Arabic (ISO-8859-6)"
msgstr "Arapça (ISO-8859-6)"
-#: ../src/charset.c:51
+#: ../src/charset.c:48
msgid "Arabic (Windows-1256)"
msgstr "Arapça (Windows-1256)"
-#: ../src/charset.c:52
+#: ../src/charset.c:49
msgid "Baltic (ISO-8859-13)"
msgstr "Baltık (ISO-8859-13)"
-#: ../src/charset.c:53
+#: ../src/charset.c:50
msgid "Baltic (ISO-8859-4)"
msgstr "Baltık (ISO-8859-4)"
-#: ../src/charset.c:54
+#: ../src/charset.c:51
msgid "Baltic (Windows-1257)"
msgstr "Baltık (Windows-1257)"
-#: ../src/charset.c:55
+#: ../src/charset.c:52
msgid "Celtic (ISO-8859-14)"
msgstr "Keltçe (ISO-8859-14)"
-#: ../src/charset.c:56
+#: ../src/charset.c:53
msgid "Central European (IBM-852)"
msgstr "Merkez Avrupa (IBM-852)"
-#: ../src/charset.c:57
+#: ../src/charset.c:54
msgid "Central European (ISO-8859-2)"
msgstr "Merkez Avrupa (ISO-8859-2)"
-#: ../src/charset.c:58
+#: ../src/charset.c:55
msgid "Central European (Windows-1250)"
msgstr "Merkez Avrupa (Windows-1250)"
-#: ../src/charset.c:59
+#: ../src/charset.c:56
msgid "Chinese Simplified (GB18030)"
msgstr "Basitleştirilmiş Çince (GB18030)"
-#: ../src/charset.c:60
+#: ../src/charset.c:57
msgid "Chinese Simplified (GB2312)"
msgstr "Basitleştirilmiş Çince (GB2312)"
-#: ../src/charset.c:61
+#: ../src/charset.c:58
msgid "Chinese Traditional (Big5)"
msgstr "Geleneksel Çince (Big5)"
-#: ../src/charset.c:62
+#: ../src/charset.c:59
msgid "Chinese Traditional (Big5-HKSCS)"
msgstr "Geleneksel Çince (Big5-HKSCS)"
-#: ../src/charset.c:63
+#: ../src/charset.c:60
msgid "Cyrillic (IBM-855)"
msgstr "Kiril (IBM-855)"
-#: ../src/charset.c:64
+#: ../src/charset.c:61
msgid "Cyrillic (ISO-8859-5)"
msgstr "Kiril (ISO-8859-5)"
-#: ../src/charset.c:65
+#: ../src/charset.c:62
msgid "Cyrillic (ISO-IR-111)"
msgstr "Kiril (ISO-IR-111)"
-#: ../src/charset.c:66
+#: ../src/charset.c:63
msgid "Cyrillic (KOI8-R)"
msgstr "Kiril (KOI8-R)"
-#: ../src/charset.c:67
+#: ../src/charset.c:64
msgid "Cyrillic (Windows-1251)"
msgstr "Kiril (Windows-1251)"
-#: ../src/charset.c:68
+#: ../src/charset.c:65
msgid "Cyrillic/Russian (CP-866)"
msgstr "Kiril/Rusça (IBM-866)"
-#: ../src/charset.c:69
+#: ../src/charset.c:66
msgid "Cyrillic/Ukrainian (KOI8-U)"
msgstr "Kiril/Ukraynaca (KOI8-U)"
-#: ../src/charset.c:70
+#: ../src/charset.c:67
msgid "English (US-ASCII)"
msgstr "İngilizce (US-ASCII)"
-#: ../src/charset.c:71
+#: ../src/charset.c:68
msgid "Greek (ISO-8859-7)"
msgstr "Yunanca (ISO-8859-7)"
-#: ../src/charset.c:72
+#: ../src/charset.c:69
msgid "Greek (Windows-1253)"
msgstr "Yunanca (Windows-1253)"
-#: ../src/charset.c:73
+#: ../src/charset.c:70
msgid "Hebrew (IBM-862)"
msgstr "İbranice (IBM-862)"
-#: ../src/charset.c:74
+#: ../src/charset.c:71
msgid "Hebrew (Windows-1255)"
msgstr "İbranice (Windows-1255)"
-#: ../src/charset.c:75
+#: ../src/charset.c:72
msgid "Japanese (EUC-JP)"
msgstr "Japonca (EUC-JP)"
-#: ../src/charset.c:76
+#: ../src/charset.c:73
msgid "Japanese (ISO-2022-JP)"
msgstr "Japonca (ISO-2022-JP)"
-#: ../src/charset.c:77
+#: ../src/charset.c:74
msgid "Japanese (Shift_JIS)"
msgstr "Japonca (Shift_JIS)"
-#: ../src/charset.c:78
+#: ../src/charset.c:75
msgid "Korean (EUC-KR)"
msgstr "Korece (EUC-KR)"
-#: ../src/charset.c:79
+#: ../src/charset.c:76
msgid "Nordic (ISO-8859-10)"
msgstr "İskandinavca (ISO-8859-10)"
-#: ../src/charset.c:80
+#: ../src/charset.c:77
msgid "South European (ISO-8859-3)"
msgstr "Güney Avrupa (ISO-8859-3)"
-#: ../src/charset.c:81
+#: ../src/charset.c:78
msgid "Thai (TIS-620)"
msgstr "Tai (TIS-620)"
-#: ../src/charset.c:82
+#: ../src/charset.c:79
msgid "Turkish (IBM-857)"
msgstr "Türkçe (IBM-857)"
-#: ../src/charset.c:83
+#: ../src/charset.c:80
msgid "Turkish (ISO-8859-9)"
msgstr "Türkçe (ISO-8859-9)"
-#: ../src/charset.c:84
+#: ../src/charset.c:81
msgid "Turkish (Windows-1254)"
msgstr "Türkçe (Windows-1254)"
#. {N_("Unicode (UTF-7)"), "UTF-7" },
-#: ../src/charset.c:86
+#: ../src/charset.c:83
msgid "Unicode (UTF-8)"
msgstr "Unikod (UTF-8)"
@@ -4042,595 +3358,543 @@ msgstr "Unikod (UTF-8)"
#. {N_("Unicode (UTF-16LE)"), "UTF-16LE" },
#. {N_("Unicode (UTF-32BE)"), "UTF-32BE" },
#. {N_("Unicode (UTF-32LE)"), "UTF-32LE" },
-#: ../src/charset.c:93
+#: ../src/charset.c:90
msgid "Vietnamese (VISCII)"
msgstr "Vietnamca (VISCII)"
-#: ../src/charset.c:94
+#: ../src/charset.c:91
msgid "Vietnamese (Windows-1258)"
msgstr "Vietnamca (Windows-1258)"
-#: ../src/charset.c:95
+#: ../src/charset.c:92
msgid "Visual Hebrew (ISO-8859-8)"
msgstr "Görsel İbranice (ISO-8859-8)"
-#: ../src/charset.c:96
+#: ../src/charset.c:93
msgid "Western (IBM-850)"
msgstr "Batı (IBM-850)"
-#: ../src/charset.c:97
+#: ../src/charset.c:94
msgid "Western (ISO-8859-1)"
msgstr "Batı (ISO-8859-1)"
-#: ../src/charset.c:98
+#: ../src/charset.c:95
msgid "Western (ISO-8859-15)"
msgstr "Batı (ISO-8859-15)"
-#: ../src/charset.c:99
+#: ../src/charset.c:96
msgid "Western (Windows-1252)"
msgstr "Batı (Windows-1252)"
-#: ../src/charset.c:511
-#, fuzzy, c-format
-#| msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
+#: ../src/charset.c:508
+#, c-format
msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
-msgstr "Dosya adı '%s' UTF-8'e dönüştürülemiyor (%s)."
+msgstr "Dosya adı ‘%s’ UTF-8'e dönüştürülemedi: %s"
-#: ../src/charset.c:513 ../src/charset.c:626 ../src/charset.c:691
+#: ../src/charset.c:510 ../src/charset.c:623 ../src/charset.c:688
msgid "Invalid UTF-8"
msgstr "Geçersiz UTF-8"
-#: ../src/charset.c:624
-#, fuzzy, c-format
-#| msgid ""
-#| "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
+#: ../src/charset.c:621
+#, c-format
msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
-msgstr "'%s' UTF-8 metni dosya adı kodlamasına dönüştürülemiyor (%s)."
+msgstr "‘%s’ UTF-8 metni dosya adı kodlamasına dönüştürülemedi: %s"
-#: ../src/charset.c:689
-#, fuzzy, c-format
-#| msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+#: ../src/charset.c:686
+#, c-format
msgid "The string ‘%s’ could not be converted into UTF-8: %s"
-msgstr "'%s' metni UTF-8'e dönüştürülemiyor (%s)."
+msgstr "‘%s’ metni UTF-8'e dönüştürülemedi: %s"
-#: ../src/easytag.c:269
-#, fuzzy, c-format
-#| msgid "A file was changed by an external program"
-#| msgid_plural "%d files were changed by an external program."
+#: ../src/easytag.c:251
+#, c-format
msgid "A file was changed by an external program"
msgid_plural "%d files were changed by an external program"
-msgstr[0] "%d dosya harici bir program tarafından değiştirilmiş."
+msgstr[0] "Bir dosya harici bir program tarafından değiştirilmiş."
+msgstr[1] "%d dosya harici bir program tarafından değiştirilmiş."
-#: ../src/easytag.c:278
+#: ../src/easytag.c:260
msgid "Do you want to continue saving the file?"
msgstr "Dosyayı kaydetmeye devam etmek istiyor musunuz?"
-#: ../src/easytag.c:339 ../src/easytag.c:360
+#: ../src/easytag.c:321 ../src/easytag.c:342
msgid "Saving files was stopped"
msgstr "Dosya kaydetme durduruldu"
-#: ../src/easytag.c:362
+#: ../src/easytag.c:344
msgid "All files have been saved"
msgstr "Tüm dosyalar kaydedildi."
-#: ../src/easytag.c:483
-#, fuzzy, c-format
-#| msgid "Do you want to write the tag of file '%s'?"
+#: ../src/easytag.c:463
+#, c-format
msgid "Do you want to write the tag of file ‘%s’?"
-msgstr "'%s' dosyasına etiketleri yazmak istiyor musunuz?"
+msgstr "‘%s’ dosyasına etiketleri yazmak istiyor musunuz?"
-#: ../src/easytag.c:485
+#: ../src/easytag.c:465
msgid "Confirm Tag Writing"
msgstr "Etiket Yazmayı Doğrula"
#. Directories and filename changed
-#: ../src/easytag.c:586
+#: ../src/easytag.c:566
msgid "Rename File and Directory"
msgstr "Dosya ve Dizini Yeniden Adlandır"
-#: ../src/easytag.c:587
+#: ../src/easytag.c:567
msgid "File and directory rename confirmation required"
msgstr "Dosya ve dizin yeniden adlandırma doğrulaması gerekiyor"
-#: ../src/easytag.c:588
-#, fuzzy, c-format
-#| msgid "Do you want to rename the file and directory '%s' to '%s'?"
+#: ../src/easytag.c:568
+#, c-format
msgid "Do you want to rename the file and directory ‘%s’ to ‘%s’?"
-msgstr "'%s' dosya ve dizinin adı '%s' şeklinde yeniden adlandırsın mı?"
+msgstr "‘%s’ dosya ve dizinin adı ‘%s’ şeklinde değiştirilsin mi?"
-#: ../src/easytag.c:594
+#: ../src/easytag.c:574
msgid "Directory rename confirmation required"
msgstr "Dizin yeniden adlandırma doğrulaması gerekiyor"
-#: ../src/easytag.c:595
-#, fuzzy, c-format
-#| msgid "Do you want to rename the directory '%s' to '%s'?"
+#: ../src/easytag.c:575
+#, c-format
msgid "Do you want to rename the directory ‘%s’ to ‘%s’?"
-msgstr "'%s' dizinin adı '%s' ile yeniden adlandırılsın mı?"
+msgstr "‘%s’ dizinin adı ‘%s’ olarak değiştirilsin mi?"
-#: ../src/easytag.c:603
+#: ../src/easytag.c:583
msgid "File rename confirmation required"
msgstr "Dosya yeniden adlandırma doğrulaması gerekiyor"
-#: ../src/easytag.c:604
-#, fuzzy, c-format
-#| msgid "Do you want to rename the file '%s' to '%s'?"
+#: ../src/easytag.c:584
+#, c-format
msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
-msgstr "'%s' dosyasının adı '%s' ile yeniden adlandırılsın mı?"
+msgstr "‘%s’ dosyasının adı ‘%s’ olarak değiştirilsin mi?"
-#: ../src/easytag.c:676
-#, fuzzy, c-format
-#| msgid "Cannot rename file '%s' to '%s'"
+#: ../src/easytag.c:654
+#, c-format
msgid "Cannot rename file ‘%s’ to ‘%s’"
-msgstr "'%s' dosyası '%s' olarak yeniden adlandırılamıyor"
+msgstr "‘%s’ dosyasının adı ‘%s’ olarak değiştirilemiyor"
-#: ../src/easytag.c:690
-#, fuzzy, c-format
-#| msgid "Cannot rename file '%s' to '%s': %s"
+#: ../src/easytag.c:668
+#, c-format
msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
-msgstr "'%s' dosyası '%s' olarak yeniden adlandırılamıyor: %s"
+msgstr "‘%s’ dosyasının adı ‘%s’ olarak değiştirilemiyor: %s"
-#: ../src/easytag.c:695
+#: ../src/easytag.c:673
msgid "File(s) not renamed"
msgstr "Dosya(lar) yeniden adlandırılamadı"
-#: ../src/easytag.c:883
-#, fuzzy, c-format
-#| msgid "Writing tag of '%s'"
+#: ../src/easytag.c:858
+#, c-format
msgid "Writing tag of ‘%s’"
-msgstr "'%s' etiketi yazılıyor"
+msgstr "‘%s’ etiketi yazılıyor"
-#: ../src/easytag.c:891
-#, fuzzy, c-format
-#| msgid "Written tag of '%s'"
+#: ../src/easytag.c:866
+#, c-format
msgid "Wrote tag of ‘%s’"
-msgstr "'%s' etiketi yazıldı"
+msgstr "‘%s’ etiketi yazıldı"
-#: ../src/easytag.c:907
-#, fuzzy, c-format
-#| msgid "Cannot write tag in file '%s'"
+#: ../src/easytag.c:882
+#, c-format
msgid "Cannot write tag in file ‘%s’"
-msgstr "'%s' dosyasına etiket yazılamıyor"
+msgstr "‘%s’ dosyasına etiket yazılamıyor"
-#: ../src/easytag.c:911
+#: ../src/easytag.c:886
msgid "Tag Write Error"
msgstr "Etiket Yazma Hatası"
-#: ../src/easytag.c:986 ../src/easytag.c:1214
-#, fuzzy, c-format
-#| msgid "Cannot read directory '%s'"
+#: ../src/easytag.c:961 ../src/easytag.c:1192
+#, c-format
msgid "Cannot read directory ‘%s’"
-msgstr "'%s' dizini okunamıyor"
+msgstr "‘%s’ dizini okunamıyor"
-#: ../src/easytag.c:990
+#: ../src/easytag.c:965
msgid "Directory Read Error"
msgstr "Dizin Okuma Hatası"
#. Read the directory recursively
-#: ../src/easytag.c:1011
+#: ../src/easytag.c:986
#, c-format
msgid "Search in progress…"
msgstr "Arama sürüyor…"
-#: ../src/easytag.c:1035 ../src/et_core.c:2986
-#, fuzzy, c-format
-#| msgid "File: '%s'"
+#: ../src/easytag.c:1010 ../src/file.c:1307
+#, c-format
msgid "File: ‘%s’"
-msgstr "Dosya: '%s'"
+msgstr "Dosya: ‘%s’"
-#: ../src/easytag.c:1082
+#: ../src/easytag.c:1060
#, c-format
msgid "Found one file in this directory and subdirectories"
-msgid_plural "Found %d files in this directory and subdirectories"
-msgstr[0] "Bu dizin ve alt dizinlerinde %d dosya bulundu"
+msgid_plural "Found %u files in this directory and subdirectories"
+msgstr[0] "Bu dizin ve alt dizinlerinde bir dosya bulundu"
+msgstr[1] "Bu dizin ve alt dizinlerinde %u dosya bulundu"
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1067
#, c-format
msgid "Found one file in this directory"
-msgid_plural "Found %d files in this directory"
-msgstr[0] "Bu dizinde %d dosya bulundu"
+msgid_plural "Found %u files in this directory"
+msgstr[0] "Bu dizinde bir dosya bulundu"
+msgstr[1] "Bu dizinde %u dosya bulundu"
-#: ../src/easytag.c:1106
+#: ../src/easytag.c:1084
msgid "No file found in this directory and subdirectories"
msgstr "Bu dizin ve alt dizinlerinde dosya bulunamadı"
-#: ../src/easytag.c:1108
+#: ../src/easytag.c:1086
msgid "No file found in this directory"
msgstr "Bu dizinde dosya bulunamadı"
-#: ../src/easytag.c:1178
-#, fuzzy, c-format
-#| msgid "Error opening directory '%s' (%s)"
+#: ../src/easytag.c:1156
+#, c-format
msgid "Error opening directory ‘%s’: %s"
-msgstr "'%s' dizini açılırken hata oluştu (%s)"
+msgstr "‘%s’ dizini açılamadı: %s"
-#: ../src/easytag.c:1234
+#: ../src/easytag.c:1212
msgid "Searching for audio files…"
msgstr "Ses dosyaları aranıyor…"
-#: ../src/easytag.c:1235
+#: ../src/easytag.c:1213
msgid "Searching"
msgstr "Aranıyor"
-#: ../src/easytag.c:1236
+#: ../src/easytag.c:1214
msgid "_Stop"
-msgstr ""
+msgstr "_Dur"
+
+#: ../src/file_area.c:285 ../src/file_area.c:340
+msgid "File not found"
+msgstr "Dosya bulunamadı"
+
+#: ../src/file_area.c:290 ../src/load_files_dialog.c:221
+#, c-format
+msgid "Cannot query file information ‘%s’"
+msgstr "Dosya bilgileri sorgulanamıyor ‘%s’"
+
+#: ../src/file_area.c:324
+msgid "Read-only file"
+msgstr "Salt okunur dosya"
-#: ../src/et_core.c:545
-#, fuzzy, c-format
-#| msgid "Error reading tag from ogg file (%s)"
+#: ../src/file_list.c:261
+#, c-format
msgid "Error reading tag from Ogg file ‘%s’: %s"
-msgstr "Ogg dosyasından etiket okunurken hata oluştu (%s)"
+msgstr "‘%s’ Ogg dosyasından etiket okunamadı: %s"
-#: ../src/et_core.c:556
-#, fuzzy, c-format
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/file_list.c:272
+#, c-format
msgid "Error reading tag from FLAC file ‘%s’: %s"
-msgstr "'%s' dosyasından etiketler okunamadı"
+msgstr "‘%s’ FLAC dosyasından etiket okunamadı: %s"
-#: ../src/et_core.c:566
-#, fuzzy, c-format
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/file_list.c:282
+#, c-format
msgid "Error reading APE tag from file ‘%s’: %s"
-msgstr "'%s' dosyasından etiketler okunamadı"
+msgstr "‘%s’ APE dosyasından etiket okunamadı: %s"
-#: ../src/et_core.c:576
-#, fuzzy, c-format
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/file_list.c:292
+#, c-format
msgid "Error reading tag from MP4 file ‘%s’: %s"
-msgstr "'%s' dosyasından etiketler okunamadı"
+msgstr "‘%s’ M4A dosyasından etiket okunamadı: %s"
-#: ../src/et_core.c:587
-#, fuzzy, c-format
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/file_list.c:303
+#, c-format
msgid "Error reading tag from WavPack file ‘%s’: %s"
-msgstr "'%s' dosyasından etiketler okunamadı"
+msgstr "‘%s’ WavPack dosyasından etiket okunamadı: %s"
-#: ../src/et_core.c:598
-#, fuzzy, c-format
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/file_list.c:314
+#, c-format
msgid "Error reading tag from Opus file ‘%s’: %s"
-msgstr "'%s' dosyasından etiketler okunamadı"
+msgstr "‘%s’ OPUS dosyasından etiket okunamadı: %s"
-#: ../src/et_core.c:614
-#, fuzzy, c-format
-#| msgid ""
-#| "The year value '%s' seems to be invalid in file '%s'. The information "
-#| "will be lost while saving tag."
-msgid ""
-"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
-"be lost when saving"
-msgstr ""
-"'%1s' dosyasındaki '%2s' yıl değeri geçersiz gibi görünüyor. Bu bilgi etiket "
-"kaydedilirken kaybolacak."
+#: ../src/file_list.c:332
+#, c-format
+msgid "The year value ‘%s’ seems to be invalid in file ‘%s’. The information will be lost when saving"
+msgstr "‘%2$s’ dosyasındaki ‘%1$s’ yıl değeri geçersiz gibi görünüyor. Bu bilgi etiket kaydedilirken kaybolacak"
-#: ../src/et_core.c:749
-#, fuzzy, c-format
-#| msgid "Automatic corrections applied for file '%s'."
+#: ../src/file_list.c:470
+#, c-format
msgid "Automatic corrections applied for file ‘%s’"
-msgstr "'%s' için otomatik doğrulama uygulandı."
+msgstr "‘%s’ için otomatik doğrulama uygulandı"
#. And refresh the number of files in this directory
-#: ../src/et_core.c:3010
+#: ../src/file.c:1331
#, c-format
msgid "One file"
msgid_plural "%u files"
-msgstr[0] "%u dosya"
+msgstr[0] "Bir dosya"
+msgstr[1] "%u dosya"
#. Bitrate
-#: ../src/et_core.c:3041 ../src/tags/flac_header.c:307
-#: ../src/tags/monkeyaudio_header.c:83 ../src/tags/mp4_header.cc:144
-#: ../src/tags/mpeg_header.c:240 ../src/tags/musepack_header.c:87
-#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:229
-#: ../src/tags/wavpack_header.c:90
+#: ../src/file.c:1366 ../src/tags/flac_header.c:172
+#: ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:245 ../src/tags/musepack_header.c:86
+#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:230
+#: ../src/tags/wavpack_header.c:145
#, c-format
msgid "%d kb/s"
msgstr "%d kb/s"
#. Samplerate
-#: ../src/et_core.c:3044 ../src/tags/flac_header.c:310
-#: ../src/tags/monkeyaudio_header.c:86 ../src/tags/mp4_header.cc:148
-#: ../src/tags/mpeg_header.c:245 ../src/tags/musepack_header.c:90
-#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:232
-#: ../src/tags/wavpack_header.c:93
+#: ../src/file.c:1369 ../src/tags/flac_header.c:175
+#: ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148
+#: ../src/tags/mpeg_header.c:250 ../src/tags/musepack_header.c:89
+#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:233
+#: ../src/tags/wavpack_header.c:148
#, c-format
msgid "%d Hz"
msgstr "%d Hz"
-#: ../src/et_core.c:3173
-#, fuzzy, c-format
-#| msgid "Could not convert filename '%s' into system filename encoding"
+#: ../src/file.c:1500
+#, c-format
msgid "Could not convert filename ‘%s’ to system filename encoding"
-msgstr "'%s' dosya adı sistem dosya adı kodlamasına dönüştürülemiyor"
+msgstr "‘%s’ dosya adı sistem dosya adı kodlamasına dönüştürülemiyor"
-#: ../src/et_core.c:3175
+#: ../src/file.c:1502
msgid "Try setting the environment variable G_FILENAME_ENCODING."
msgstr "G_FILENAME_ENCODING ortam değişkenini ayarlamayı deneyin."
-#: ../src/et_core.c:3176 ../src/scan_dialog.c:719
+#: ../src/file.c:1503 ../src/scan_dialog.c:817
msgid "Filename translation"
msgstr "Dosya adı dönüştürme"
-#: ../src/file_area.c:279 ../src/file_area.c:334
-msgid "File not found"
-msgstr "Dosya bulunamadı"
-
-#: ../src/file_area.c:284 ../src/load_files_dialog.c:221
-#, fuzzy, c-format
-#| msgid "Cannot query file information (%s)"
-msgid "Cannot query file information ‘%s’"
-msgstr "Dosya bilgileri sorgulanamıyor (%s)"
-
-#: ../src/file_area.c:318
-msgid "Read-only file"
-msgstr "Salt okunur dosya"
-
#: ../src/load_files_dialog.c:291
#, c-format
-#| msgid "Error reading file (%s)"
msgid "Error reading file ‘%s’"
msgstr "‘%s’ dosyası okunurken hata oluştu"
-#: ../src/load_files_dialog.c:628 ../src/load_files_dialog.c:731
+#: ../src/load_files_dialog.c:631 ../src/load_files_dialog.c:734
msgid "Insert a blank line"
msgstr "Boş satır ekle"
-#: ../src/load_files_dialog.c:632 ../src/load_files_dialog.c:735
+#: ../src/load_files_dialog.c:635 ../src/load_files_dialog.c:738
msgid "Delete this line"
msgstr "Satırı sil"
-#: ../src/load_files_dialog.c:643 ../src/load_files_dialog.c:746
-#| msgid "Move up this line"
+#: ../src/load_files_dialog.c:646 ../src/load_files_dialog.c:749
msgid "Move this line up"
msgstr "Satırı yukarı taşı"
-#: ../src/load_files_dialog.c:647 ../src/load_files_dialog.c:750
-#| msgid "Move up this line"
+#: ../src/load_files_dialog.c:650 ../src/load_files_dialog.c:753
msgid "Move this line down"
msgstr "Satırı aşağı taşı"
-#: ../src/load_files_dialog.c:893
+#: ../src/load_files_dialog.c:896
msgid "Load Filenames From a Text File"
msgstr "Dosya Adlarını Metin Dosyasından Yükle"
-#: ../src/misc.c:208
+#: ../src/misc.c:184
msgid "You must type a program name"
msgstr "Bir program adı yazmalısınız."
-#: ../src/misc.c:209
+#: ../src/misc.c:185
msgid "Program Name Error"
msgstr "Program Adı Hatası"
-#: ../src/picture.c:199
+#: ../src/picture.c:175
msgid "JPEG image"
msgstr "JPEG görüntüsü"
-#: ../src/picture.c:201
+#: ../src/picture.c:177
msgid "PNG image"
msgstr "PNG görüntüsü"
-#: ../src/picture.c:203
-#| msgid "PNG image"
+#: ../src/picture.c:179
msgid "GIF image"
msgstr "GIF görüntüsü"
-#: ../src/picture.c:205
+#: ../src/picture.c:182
msgid "Unknown image"
msgstr "Bilinmeyen görüntü"
-#: ../src/picture.c:217
-#| msgid "32x32 pixel PNG file icon"
+#: ../src/picture.c:194
msgid "32×32 pixel PNG file icon"
msgstr "32x32 piksel PNG dosya simgesi"
-#: ../src/picture.c:219
+#: ../src/picture.c:196
msgid "Other file icon"
msgstr "Diğer dosya simgesi"
-#: ../src/picture.c:221
+#: ../src/picture.c:198
msgid "Cover (front)"
msgstr "Kapak (ön)"
-#: ../src/picture.c:223
+#: ../src/picture.c:200
msgid "Cover (back)"
msgstr "Kapak (arka)"
-#: ../src/picture.c:225
+#: ../src/picture.c:202
msgid "Leaflet page"
msgstr "Kitapçık sayfası"
-#: ../src/picture.c:227
-#, fuzzy
-#| msgid "Media (e.g. label side of CD)"
+#: ../src/picture.c:204
msgid "Media (such as label side of CD)"
-msgstr "Ortam (örn. CD'nin üzeri)"
+msgstr "Ortam (CD'nin üzeri gibi)"
-#: ../src/picture.c:229
+#: ../src/picture.c:206
msgid "Lead artist/lead performer/soloist"
msgstr "lider sanatçı/solist"
-#: ../src/picture.c:231
+#: ../src/picture.c:208
msgid "Artist/performer"
msgstr "Sanatçı"
-#: ../src/picture.c:233
+#: ../src/picture.c:210
msgid "Conductor"
msgstr "Yapımcı"
-#: ../src/picture.c:235
+#: ../src/picture.c:212
msgid "Band/Orchestra"
msgstr "Orkestra"
-#: ../src/picture.c:239
+#: ../src/picture.c:216
msgid "Lyricist/text writer"
msgstr "Şarkı sözleri"
-#: ../src/picture.c:241
+#: ../src/picture.c:218
msgid "Recording location"
msgstr "Kayıt yeri"
-#: ../src/picture.c:243
+#: ../src/picture.c:220
msgid "During recording"
msgstr "Kayıt sırasında"
-#: ../src/picture.c:245
+#: ../src/picture.c:222
msgid "During performance"
msgstr "Performans sırasında"
-#: ../src/picture.c:247
+#: ../src/picture.c:224
msgid "Movie/video screen capture"
msgstr "Ekran kaydı videosu"
-#: ../src/picture.c:249
+#: ../src/picture.c:226
msgid "A bright colored fish"
msgstr "Parlak renkli balık"
-#: ../src/picture.c:251
+#: ../src/picture.c:228
msgid "Illustration"
msgstr "İlizyon"
-#: ../src/picture.c:253
+#: ../src/picture.c:230
msgid "Band/Artist logotype"
msgstr "Sanatçı logosu"
-#: ../src/picture.c:255
+#: ../src/picture.c:232
msgid "Publisher/studio logotype"
msgstr "Stüdyo logosu"
-#: ../src/picture.c:259
+#: ../src/picture.c:236
msgid "Unknown image type"
msgstr "Bilinmeyen görüntü biçimi"
-#: ../src/picture.c:287 ../src/picture.c:296
+#: ../src/picture.c:262 ../src/picture.c:268
msgid "pixels"
msgstr "piksel"
-#: ../src/picture.c:287 ../src/picture.c:296
+#: ../src/picture.c:262 ../src/picture.c:268
msgid "Type"
msgstr "Biçim"
-#: ../src/playlist_dialog.c:528
-#, fuzzy, c-format
-#| msgid "Cannot write playlist file '%s'"
+#: ../src/playlist_dialog.c:541
+#, c-format
msgid "Cannot write playlist file ‘%s’"
-msgstr "'%s' çalma listesi oluşturulamıyor"
+msgstr "‘%s’ çalma listesi oluşturulamıyor"
-#: ../src/playlist_dialog.c:532
+#: ../src/playlist_dialog.c:545
msgid "Playlist File Error"
msgstr "Çalma Listesi Dosyası Hatası"
-#: ../src/playlist_dialog.c:540
-#, fuzzy, c-format
-#| msgid "Written playlist file '%s'"
+#: ../src/playlist_dialog.c:553
+#, c-format
msgid "Wrote playlist file ‘%s’"
-msgstr "'%s' dosyasına çalma listesi yazıldı"
+msgstr "‘%s’ dosyasına çalma listesi yazıldı"
-#: ../src/playlist_dialog.c:622 ../src/scan_dialog.c:2770
-#: ../src/scan_dialog.c:2832
+#: ../src/playlist_dialog.c:635 ../src/scan_dialog.c:2818
+#: ../src/scan_dialog.c:2880
msgid "Invalid scanner mask"
msgstr "Geçersiz tarayıcı maskesi"
-#: ../src/playlist_dialog.c:653
+#: ../src/playlist_dialog.c:666
msgid "Generate Playlist"
msgstr "Çalma Listesi Oluştur"
#. The window
-#: ../src/preferences_dialog.c:293
+#: ../src/preferences_dialog.c:289
msgid "Preferences"
msgstr "Tercihler"
-#: ../src/preferences_dialog.c:1130
-#, fuzzy
-#| msgid "The selected path for 'Default path to files' is invalid"
+#: ../src/preferences_dialog.c:1126
msgid "The selected default path is invalid"
-msgstr "'Dosyalar için öntanımlı konum' için seçilen konum geçersiz"
+msgstr "Seçilen öntanımlı konum geçersiz"
-#: ../src/preferences_dialog.c:1132
-#, fuzzy, c-format
-#| msgid ""
-#| "Path: '%s'\n"
-#| "Error: %s"
+#: ../src/preferences_dialog.c:1128
+#, c-format
msgid ""
"Path: ‘%s’\n"
"Error: %s"
msgstr ""
-"Konum: '%s'\n"
+"Konum: ‘%s’\n"
"Hata: %s"
-#: ../src/preferences_dialog.c:1136
+#: ../src/preferences_dialog.c:1132
msgid "Invalid Path Error"
msgstr "Geçersiz Konum Hatası"
-#: ../src/scan_dialog.c:307
-#, fuzzy, c-format
-#| msgid "Cannot calculate CRC value of file (%s)"
+#: ../src/scan_dialog.c:404
+#, c-format
msgid "Cannot calculate CRC value of file ‘%s’"
-msgstr "Dosyanın CRC değeri hesaplanamıyor (%s)"
+msgstr "‘%s’ dosyasının CRC değeri hesaplanamıyor"
-#: ../src/scan_dialog.c:323
+#: ../src/scan_dialog.c:419
msgid "Tag successfully scanned"
msgstr "Etiket başarıyla tarandı"
-#: ../src/scan_dialog.c:326
-#, fuzzy, c-format
-#| msgid "Tag successfully scanned: %s"
+#: ../src/scan_dialog.c:422
+#, c-format
msgid "Tag successfully scanned ‘%s’"
-msgstr "Etiket başarıyla tarandı: %s"
+msgstr "Etiket başarıyla tarandı ‘%s’"
-#: ../src/scan_dialog.c:369
-#, fuzzy, c-format
-#| msgid ""
-#| "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
+#: ../src/scan_dialog.c:465
+#, c-format
msgid "The extension ‘%s’ was not found in filename ‘%s’"
-msgstr "Etiket tarayıcı:yabancı… '%s' eklentisi '%s' dosyasında bulunamadı"
+msgstr "‘%s’ eklentisi ‘%s’ dosyasında bulunamadı"
-#: ../src/scan_dialog.c:459 ../src/scan_dialog.c:490
-#, fuzzy, c-format
-#| msgid "Scan Error: can't find separator '%s' within '%s'"
+#: ../src/scan_dialog.c:557 ../src/scan_dialog.c:588
+#, c-format
msgid "Cannot find separator ‘%s’ within ‘%s’"
-msgstr "Tarama Hatası: '%s' ile '%s' arasına ayırıcı bulunamadı"
+msgstr "‘%s’ ile ‘%s’ arasına ayırıcı bulunamadı"
-#: ../src/scan_dialog.c:717
-#, fuzzy, c-format
-#| msgid "Could not convert filename '%s' into system filename encoding"
+#: ../src/scan_dialog.c:815
+#, c-format
msgid "Could not convert filename ‘%s’ into system filename encoding"
-msgstr "'%s' dosya adı sistem dosya adı kodlamasına dönüştürülemiyor"
+msgstr "‘%s’ dosya adı sistem dosya adı kodlamasına dönüştürülemiyor"
-#: ../src/scan_dialog.c:742
+#: ../src/scan_dialog.c:840
msgid "New filename successfully scanned"
msgstr "Yeni dosya adı başarıyla tarandı"
-#: ../src/scan_dialog.c:746
-#, fuzzy, c-format
-#| msgid "New filename successfully scanned: %s"
+#: ../src/scan_dialog.c:844
+#, c-format
msgid "New filename successfully scanned ‘%s’"
-msgstr "Yeni dosya adı başarıyla tarandı: %s"
+msgstr "Yeni dosya adı başarıyla tarandı ‘%s’"
-#: ../src/scan_dialog.c:1109
-#, fuzzy, c-format
-#| msgid "Error while processing fields: %s"
+#: ../src/scan_dialog.c:1212
+#, c-format
msgid "Error while processing fields ‘%s’"
-msgstr "Alanlar işlenemiyor: %s"
+msgstr "Alanlar işlenemiyor ‘%s’"
-#: ../src/scan_dialog.c:2040
+#: ../src/scan_dialog.c:2088
msgid "New_mask"
msgstr "Yeni_make"
#. The window
-#: ../src/scan_dialog.c:2257
+#: ../src/scan_dialog.c:2305
msgid "Tag and Filename Scan"
msgstr "Etiket ve Dosya Adı Tarayıcı"
#. 'Scan selected files' button
-#: ../src/scan_dialog.c:2263
+#: ../src/scan_dialog.c:2311
msgid "Scan Files"
msgstr "Dosyaları Tara"
-#: ../src/scan_dialog.c:2269
+#: ../src/scan_dialog.c:2317
msgid "Scan selected files"
msgstr "Seçilen dosyaları tara"
-#: ../src/scan_dialog.c:2907
+#: ../src/scan_dialog.c:2955
msgid "All tags have been scanned"
msgstr "Bütün etiketler tarandı"
@@ -4638,7 +3902,8 @@ msgstr "Bütün etiketler tarandı"
#, c-format
msgid "Found one file"
msgid_plural "Found %d files"
-msgstr[0] "%d adet dosya bulundu"
+msgstr[0] "Bir adet dosya bulundu"
+msgstr[1] "%d adet dosya bulundu"
#: ../src/search_dialog.c:594
msgid "Find Files"
@@ -4648,427 +3913,328 @@ msgstr "Dosyaları Bul"
msgid "Ready to search…"
msgstr "Aramaya hazır…"
-#: ../src/setting.c:142
-#, fuzzy, c-format
-#| msgid "Cannot create or open file '%s' (%s)"
-msgid "Cannot create or open file ‘%s’: %s"
-msgstr "'%s' dosyası oluşturulamıyor veya okunamıyor (%s)"
-
-#: ../src/setting.c:192
-#, fuzzy, c-format
-#| msgid "Error: Cannot write list to file: %s (%s)"
+#: ../src/setting.c:245
+#, c-format
msgid "Cannot write list to file ‘%s’: %s"
-msgstr "Hata: Liste dosyaya yazılamıyor: %s (%s)"
-
-#: ../src/setting.c:210
-#, fuzzy, c-format
-#| msgid "Error while writing list file: %s"
-msgid "Error while writing list file ‘%s’"
-msgstr "Dosya listesi yazılırken hata oluştu: %s"
+msgstr "Liste ‘%s’ dosyasına yazılamıyor: %s"
#. Fall back to defaults.
-#: ../src/setting.c:290
-#, fuzzy
-#| msgid "Loading default 'Fill Tag' masks…"
+#: ../src/setting.c:350
msgid "Loading default ‘Fill Tag’ masks…"
-msgstr "Öntanımlı 'Etiketleri Doldur' maskesi yükleniyor…"
+msgstr "Öntanımlı ‘Etiketleri Doldur’ maskesi yükleniyor…"
#. Fall back to defaults.
-#: ../src/setting.c:320
-#, fuzzy
-#| msgid "Loading default 'Rename File' masks…"
+#: ../src/setting.c:380
msgid "Loading default ‘Rename File’ masks…"
-msgstr "Öntanımlı 'Dosya Yeniden Adlandırma' maskesi yükleniyor…"
-
-#: ../src/setting.c:406
-#, fuzzy, c-format
-#| msgid "Migrating configuration from directory '%s' to '%s'"
-msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
-msgstr "Yapılandırma '%s' dizininden '%s' dizinine taşınıyor."
-
-#: ../src/setting.c:430
-#, fuzzy, c-format
-#| msgid "Failed to migrate configuration file '%s'"
-msgid "Failed to migrate configuration file ‘%s’"
-msgstr "'%s' yapılandırma dosyası taşınamadı"
-
-#: ../src/setting.c:467
-#, fuzzy, c-format
-#| msgid "Cannot create target directory '%s': %s"
-msgid "Cannot create directory ‘%s’: %s"
-msgstr "'%s' hedef dizini oluşturulamıyor: %s"
-
-#: ../src/status_bar.c:145
+msgstr "Öntanımlı ‘Dosya Yeniden Adlandırma’ maskesi yükleniyor…"
+
+#: ../src/status_bar.c:146
msgid "Ready to start"
msgstr "Başlamaya hazır"
-#: ../src/tag_area.c:187
-#, fuzzy, c-format
-#| msgid "Selected files tagged with title '%s'."
+#: ../src/tag_area.c:186
+#, c-format
msgid "Selected files tagged with title ‘%s’"
-msgstr "Seçilen dosyalar '%s' başlığı ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ başlığı ile etiketlendi"
-#: ../src/tag_area.c:192
-#, fuzzy
-#| msgid "Removed title from selected files."
+#: ../src/tag_area.c:191
msgid "Removed title from selected files"
-msgstr "Seçilen dosyalardan başlık silindi."
+msgstr "Seçilen dosyalardan başlık silindi"
-#: ../src/tag_area.c:209
-#, fuzzy, c-format
-#| msgid "Selected files tagged with artist '%s'."
+#: ../src/tag_area.c:208
+#, c-format
msgid "Selected files tagged with artist ‘%s’"
-msgstr "Seçilen dosyalar '%s' sanatçısı ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ sanatçısı ile etiketlendi"
-#: ../src/tag_area.c:214
-#, fuzzy
-#| msgid "Removed artist from selected files."
+#: ../src/tag_area.c:213
msgid "Removed artist from selected files"
msgstr "Seçilen dosyalardan sanatçı silindi"
-#: ../src/tag_area.c:230
-#, fuzzy, c-format
-#| msgid "Selected files tagged with album artist '%s'."
+#: ../src/tag_area.c:229
+#, c-format
msgid "Selected files tagged with album artist ‘%s’"
-msgstr "Seçilen dosyalar '%s' albüm sanatçısı ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ albüm sanatçısı ile etiketlendi"
-#: ../src/tag_area.c:235
-#, fuzzy
-#| msgid "Removed album artist from selected files."
+#: ../src/tag_area.c:234
msgid "Removed album artist from selected files"
msgstr "Seçilen dosyalardan albüm sanatçısı silindi"
-#: ../src/tag_area.c:252
-#, fuzzy, c-format
-#| msgid "Selected files tagged with album '%s'."
+#: ../src/tag_area.c:251
+#, c-format
msgid "Selected files tagged with album ‘%s’"
-msgstr "Seçilen dosyalar '%s' albümü ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ albümü ile etiketlendi"
-#: ../src/tag_area.c:257
-#, fuzzy
-#| msgid "Removed album name from selected files."
+#: ../src/tag_area.c:256
msgid "Removed album name from selected files"
msgstr "Seçilen dosyalardan albümü silindi"
-#: ../src/tag_area.c:295
-#, fuzzy, c-format
-#| msgid "Selected files tagged with disc number '%s/%s'."
+#: ../src/tag_area.c:294
+#, c-format
msgid "Selected files tagged with disc number ‘%s/%s’"
-msgstr "'%s/%s' disk numarası ile etiketlenmiş seçili dosyalar."
+msgstr "‘%s/%s’ disk numarası ile etiketlenmiş seçili dosyalar"
-#: ../src/tag_area.c:300
-#, fuzzy, c-format
-#| msgid "Selected files tagged with disc number like 'xx'."
+#: ../src/tag_area.c:299
+#, c-format
msgid "Selected files tagged with disc number like ‘xx’"
-msgstr "'xx' gibi bir disk numarasıyla etiketlenmiş seçili dosyalar."
+msgstr "‘xx’ gibi bir disk numarasıyla etiketlenmiş seçili dosyalar"
-#: ../src/tag_area.c:305
-#, fuzzy
-#| msgid "Removed disc number from selected files."
+#: ../src/tag_area.c:304
msgid "Removed disc number from selected files"
msgstr "Seçilen dosyalardan disk numarası silindi"
-#: ../src/tag_area.c:322
-#, fuzzy, c-format
-#| msgid "Selected files tagged with year '%s'."
+#: ../src/tag_area.c:321
+#, c-format
msgid "Selected files tagged with year ‘%s’"
-msgstr "Seçilen dosyalar '%s' yılı ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ yılı ile etiketlendi"
-#: ../src/tag_area.c:327
-#, fuzzy
-#| msgid "Removed year from selected files."
+#: ../src/tag_area.c:326
msgid "Removed year from selected files"
msgstr "Seçilen dosyalardan yıl silindi"
-#: ../src/tag_area.c:354 ../src/tag_area.c:448
-#, fuzzy, c-format
-#| msgid "Selected files tagged with track like 'xx/%s'."
+#: ../src/tag_area.c:356 ../src/tag_area.c:450
+#, c-format
msgid "Selected files tagged with track like ‘xx/%s’"
-msgstr "Seçilen dosyaların parça numarası 'xx/%s' şeklinde etiketlendi."
+msgstr "Seçilen dosyaların parça numarası ‘xx/%s’ şeklinde etiketlendi"
-#: ../src/tag_area.c:358
-#, fuzzy, c-format
-#| msgid "Selected files tagged with track like 'xx'."
+#: ../src/tag_area.c:360
+#, c-format
msgid "Selected files tagged with track like ‘xx’"
-msgstr "Seçilen dosyaların parça numarası 'xx' şeklinde etiketlendi."
+msgstr "Seçilen dosyaların parça numarası ‘xx’ şeklinde etiketlendi"
-#: ../src/tag_area.c:363 ../src/tag_area.c:453
-#, fuzzy
-#| msgid "Removed track number from selected files."
+#: ../src/tag_area.c:365 ../src/tag_area.c:455
msgid "Removed track number from selected files"
msgstr "Seçilen dosyalardan parça numarası silindi"
#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/tag_area.c:421
-#, fuzzy, c-format
-#| msgid "Selected tracks numbered sequentially."
+#: ../src/tag_area.c:423
+#, c-format
msgid "Selected tracks numbered sequentially"
-msgstr "Seçilen parçalar ardışık olarak numaralandı."
+msgstr "Seçilen parçalar ardışık olarak numaralandı"
-#: ../src/tag_area.c:470
-#, fuzzy, c-format
-#| msgid "Selected files tagged with genre '%s'."
+#: ../src/tag_area.c:472
+#, c-format
msgid "Selected files tagged with genre ‘%s’"
-msgstr "Seçilen dosyalar '%s' türü ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ türü ile etiketlendi"
-#: ../src/tag_area.c:475
-#, fuzzy
-#| msgid "Removed genre from selected files."
+#: ../src/tag_area.c:477
msgid "Removed genre from selected files"
msgstr "Seçilen dosyalardan türü silindi"
-#: ../src/tag_area.c:499
-#, fuzzy, c-format
-#| msgid "Selected files tagged with comment '%s'."
+#: ../src/tag_area.c:501
+#, c-format
msgid "Selected files tagged with comment ‘%s’"
-msgstr "Seçilen dosyalar '%s' yorumu ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ yorumu ile etiketlendi"
-#: ../src/tag_area.c:504
-#, fuzzy
-#| msgid "Removed comment from selected files."
+#: ../src/tag_area.c:506
msgid "Removed comment from selected files"
msgstr "Seçilen dosyalardan yorum silindi"
-#: ../src/tag_area.c:520
-#, fuzzy, c-format
-#| msgid "Selected files tagged with composer '%s'."
+#: ../src/tag_area.c:522
+#, c-format
msgid "Selected files tagged with composer ‘%s’"
-msgstr "Seçilen dosyalar '%s' besteci ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ besteci ile etiketlendi"
-#: ../src/tag_area.c:525
-#, fuzzy
-#| msgid "Removed composer from selected files."
+#: ../src/tag_area.c:527
msgid "Removed composer from selected files"
msgstr "Seçilen dosyalardan besteci silindi"
-#: ../src/tag_area.c:542
-#, fuzzy, c-format
-#| msgid "Selected files tagged with original artist '%s'."
+#: ../src/tag_area.c:544
+#, c-format
msgid "Selected files tagged with original artist ‘%s’"
-msgstr "Seçilen dosyalar '%s' asıl sanatçısı ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ asıl sanatçısı ile etiketlendi"
-#: ../src/tag_area.c:547
-#, fuzzy
-#| msgid "Removed original artist from selected files."
+#: ../src/tag_area.c:549
msgid "Removed original artist from selected files"
msgstr "Seçilen dosyalardan asıl sanatçı silindi"
-#: ../src/tag_area.c:564
-#, fuzzy, c-format
-#| msgid "Selected files tagged with copyright '%s'."
+#: ../src/tag_area.c:566
+#, c-format
msgid "Selected files tagged with copyright ‘%s’"
-msgstr "Seçilen dosyalar '%s' telif hakkı ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ telif hakkı ile etiketlendi"
-#: ../src/tag_area.c:569
-#, fuzzy
-#| msgid "Removed copyright from selected files."
+#: ../src/tag_area.c:571
msgid "Removed copyright from selected files"
msgstr "Seçilen dosyalardan telif hakkı silindi"
-#: ../src/tag_area.c:586
-#, fuzzy, c-format
-#| msgid "Selected files tagged with URL '%s'."
+#: ../src/tag_area.c:588
+#, c-format
msgid "Selected files tagged with URL ‘%s’"
-msgstr "Seçilen dosyalar '%s' bağlantısı ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ bağlantısı ile etiketlendi"
-#: ../src/tag_area.c:591
-#, fuzzy
-#| msgid "Removed URL from selected files."
+#: ../src/tag_area.c:593
msgid "Removed URL from selected files"
msgstr "Seçilen dosyalardan bağlantı silindi"
-#: ../src/tag_area.c:608
-#, fuzzy, c-format
-#| msgid "Selected files tagged with encoder name '%s'."
+#: ../src/tag_area.c:610
+#, c-format
msgid "Selected files tagged with encoder name ‘%s’"
-msgstr "Seçilen dosyalar '%s' kodlayıcısı ile etiketlendi."
+msgstr "Seçilen dosyalar ‘%s’ kodlayıcısı ile etiketlendi"
-#: ../src/tag_area.c:613
-#, fuzzy
-#| msgid "Removed encoder name from selected files."
+#: ../src/tag_area.c:615
msgid "Removed encoder name from selected files"
msgstr "Seçilen dosyalardan kodlayıcı silindi"
-#: ../src/tag_area.c:647
-#, fuzzy
-#| msgid "Selected files tagged with images."
+#: ../src/tag_area.c:650
msgid "Selected files tagged with images"
-msgstr "Seçilen dosyalar görüntülerle ile etiketlendi."
+msgstr "Seçilen dosyalar görüntülerle ile etiketlendi"
-#: ../src/tag_area.c:651
-#, fuzzy
-#| msgid "Removed images from selected files."
+#: ../src/tag_area.c:654
msgid "Removed images from selected files"
msgstr "Seçilen dosyalardan görüntüler silindi"
#. Menu items
-#: ../src/tag_area.c:820
+#: ../src/tag_area.c:823
msgid "Tag selected files with this field"
msgstr "Seçilen dosyaları bu alanda etiketle"
-#: ../src/tag_area.c:847
+#: ../src/tag_area.c:850
msgid "All uppercase"
msgstr "Tümü büyük harf"
-#: ../src/tag_area.c:853
+#: ../src/tag_area.c:856
msgid "All lowercase"
msgstr "Tümü küçük harf"
-#: ../src/tag_area.c:859
+#: ../src/tag_area.c:862
msgid "First letter uppercase"
msgstr "İlk harf büyük"
-#: ../src/tag_area.c:865
+#: ../src/tag_area.c:868
msgid "First letter uppercase of each word"
msgstr "Her kelimenin ilk harfi büyük"
-#: ../src/tag_area.c:881
+#: ../src/tag_area.c:884
msgid "Insert space before uppercase letter"
msgstr "Büyük harften önce boşluk ekle"
-#: ../src/tag_area.c:887
+#: ../src/tag_area.c:890
msgid "Remove duplicate spaces or underscores"
msgstr "Çift boşluk ve alt çizgileri sil"
-#: ../src/tag_area.c:893
+#: ../src/tag_area.c:896
msgid "Remove all text"
msgstr "Tüm metni sil"
-#: ../src/tag_area.c:1269 ../src/tag_area.c:1347
+#: ../src/tag_area.c:1258 ../src/tag_area.c:1336
#, c-format
msgid "Error parsing image data ‘%s’"
-msgstr ""
+msgstr "Görüntü verisi ayrıştırılamadı ‘%s’"
-#: ../src/tag_area.c:1329
-#, fuzzy
-#| msgid ""
-#| "Cannot display the image because not enough data has been read to "
-#| "determine how to create the image buffer."
-msgid ""
-"Cannot display the image because not enough data has been read to determine "
-"how to create the image buffer"
-msgstr ""
-"Görüntü gösterilemiyor çünkü görüntü arabelleği belirlemek için yeterli veri "
-"yok"
+#: ../src/tag_area.c:1318
+msgid "Cannot display the image because not enough data has been read to determine how to create the image buffer"
+msgstr "Görüntü gösterilemiyor çünkü görüntü arabelleği belirlemek için yeterli veri yok"
-#: ../src/tag_area.c:1336
+#: ../src/tag_area.c:1325
msgid "Cannot display the image"
msgstr "Görüntü gösterilemiyor"
-#: ../src/tag_area.c:1338
-msgid ""
-"Not enough data has been read to determine how to create the image buffer."
+#: ../src/tag_area.c:1327
+msgid "Not enough data has been read to determine how to create the image buffer."
msgstr "Görüntü arabelleği belirlemek için yeterli veri yok"
-#: ../src/tag_area.c:1340
+#: ../src/tag_area.c:1329
msgid "Load Image File"
msgstr "Görüntü Dosyası Yükle"
-#: ../src/tag_area.c:1384 ../src/tag_area.c:1409
-#, fuzzy, c-format
-#| msgid "Image file not loaded: %s"
+#: ../src/tag_area.c:1373 ../src/tag_area.c:1398
+#, c-format
msgid "Image file not loaded ‘%s’"
-msgstr "'%s' görüntü dosyası yüklenemiyor"
+msgstr "‘%s’ görüntü dosyası yüklenemedi"
-#: ../src/tag_area.c:1401
+#: ../src/tag_area.c:1390
#, c-format
-#| msgid "Cannot open file: '%s'"
msgid "Cannot open file ‘%s’"
msgstr "‘%s’ dosyası açılamıyor"
-#: ../src/tag_area.c:1405
+#: ../src/tag_area.c:1394
msgid "Image File Error"
msgstr "Görüntü Dosyası Hatası"
-#: ../src/tag_area.c:1416
+#: ../src/tag_area.c:1405
msgid "Image file loaded"
msgstr "Görüntü dosyası yüklendi"
-#: ../src/tag_area.c:1487
+#: ../src/tag_area.c:1485
msgid "Add Images"
msgstr "Görüntü ekle"
-#: ../src/tag_area.c:1498 ../src/tag_area.c:1863
+#: ../src/tag_area.c:1495 ../src/tag_area.c:1845
msgid "All Files"
msgstr "Tüm Dosyalar"
-#: ../src/tag_area.c:1504 ../src/tag_area.c:1869
+#: ../src/tag_area.c:1502 ../src/tag_area.c:1852
msgid "PNG and JPEG"
msgstr "PNG ve JPEG"
-#: ../src/tag_area.c:1648
+#: ../src/tag_area.c:1641
#, c-format
msgid "Image Properties %d/%d"
msgstr "Görüntü özellikleri %d/%d"
-#: ../src/tag_area.c:1848
+#: ../src/tag_area.c:1831
#, c-format
msgid "Save Image %d/%d"
msgstr "Görüntüyü Kaydet %d/%d"
-#: ../src/tag_area.c:1925
-#, fuzzy, c-format
-#| msgid "Image file not saved: %s"
+#: ../src/tag_area.c:1911
+#, c-format
msgid "Image file not saved ‘%s’"
-msgstr "Görüntü dosyası kaydedilmedi: %s"
+msgstr "Görüntü dosyası kaydedilmedi ‘%s’"
-#: ../src/tag_area.c:2268
+#: ../src/tag_area.c:2257
msgid "Tag selected files with this genre"
msgstr "Seçilen dosyalara bu türü etiketle"
-#: ../src/tag_area.c:2998
+#: ../src/tag_area.c:2984
msgid "ID3 Tag"
msgstr "ID3 Etiketi"
-#: ../src/tag_area.c:3003
+#: ../src/tag_area.c:2989
msgid "Ogg Vorbis Tag"
msgstr "Ogg Vorbis Etiketi"
-#: ../src/tag_area.c:3008
+#: ../src/tag_area.c:2994
msgid "FLAC Vorbis Tag"
msgstr "FLAC Vorbis Etiketi"
-#: ../src/tag_area.c:3012
+#: ../src/tag_area.c:2998
msgid "APE Tag"
msgstr "APE Etiketi"
-#: ../src/tag_area.c:3016
+#: ../src/tag_area.c:3002
msgid "MP4/M4A/AAC Tag"
msgstr "MP4/M4A/AAC Etiketi"
-#: ../src/tag_area.c:3021
+#: ../src/tag_area.c:3007
msgid "Wavpack Tag"
msgstr "Wavpack Etiketi"
-#: ../src/tag_area.c:3026
+#: ../src/tag_area.c:3012
msgid "Opus Tag"
msgstr "Opus Etiketi"
-#: ../src/tag_area.c:3266
+#: ../src/tag_area.c:3252
+#, c-format
+msgid "Images (%u)"
+msgstr "Görüntüler (%u)"
+
+#: ../src/tags/ape_tag.c:63 ../src/tags/mp4_header.cc:58
+#: ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:72
+#: ../src/tags/mp4_tag.cc:85 ../src/tags/mp4_tag.cc:91
+#: ../src/tags/ogg_header.c:227
#, c-format
-msgid "Images (%d)"
-msgstr "Görüntüler (%d)"
-
-#: ../src/tags/ape_tag.c:66 ../src/tags/flac_tag.c:136
-#: ../src/tags/mp4_header.cc:58 ../src/tags/mp4_header.cc:67
-#: ../src/tags/mp4_tag.cc:66 ../src/tags/mp4_tag.cc:79
-#: ../src/tags/mp4_tag.cc:85 ../src/tags/ogg_header.c:228
-#, fuzzy, c-format
-#| msgid "Error while opening file: '%s' (%s)"
msgid "Error while opening file: %s"
-msgstr "Dosya açılırken hata oluştu: '%s' (%s)"
+msgstr "Dosya açılamadı: %s"
-#: ../src/tags/ape_tag.c:369
+#: ../src/tags/ape_tag.c:385
msgid "Failed to write APE tag"
-msgstr ""
+msgstr "APE etiketi yazılamadı"
-#: ../src/tags/flac_header.c:213
-#, fuzzy
-#| msgid "Error reading file (%s)"
+#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:116
msgid "Error opening FLAC file"
-msgstr "Dosya okunurken hata oluştu (%s)"
+msgstr "FLAC dosyası okunamadı"
-#: ../src/tags/flac_header.c:300
+#: ../src/tags/flac_header.c:165
msgid "FLAC File"
msgstr "FLAC Dosyası"
@@ -5076,346 +4242,324 @@ msgstr "FLAC Dosyası"
#. Mode
#. mpeg4ip library seems to always return -1
#. Mode
-#: ../src/tags/flac_header.c:313 ../src/tags/mp4_header.cc:152
-#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:235
-#: ../src/tags/wavpack_header.c:96
+#: ../src/tags/flac_header.c:178 ../src/tags/mp4_header.cc:152
+#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:236
+#: ../src/tags/wavpack_header.c:151
msgid "Channels:"
msgstr "Kanallar:"
-#: ../src/tags/flac_tag.c:857 ../src/tags/flac_tag.c:869
-#, fuzzy, c-format
-#| msgid "Error while opening file: '%s' as FLAC (%s)."
+#: ../src/tags/flac_tag.c:819 ../src/tags/flac_tag.c:852
+#: ../src/tags/flac_tag.c:866
+#, c-format
msgid "Error while opening file ‘%s’ as FLAC: %s"
-msgstr "Dosya açılamadı: '%s' FLAC (%s)."
+msgstr "‘%s’ FLAC dosyası olarak açılamadı: %s"
-#: ../src/tags/flac_tag.c:1130
-#, fuzzy, c-format
-#| msgid "Error: Failed to write comments to file '%s' (%s)."
+#: ../src/tags/flac_tag.c:1148 ../src/tags/flac_tag.c:1160
+#: ../src/tags/flac_tag.c:1180
+#, c-format
msgid "Failed to write comments to file ‘%s’: %s"
-msgstr "Hata: '%s' dosyasına yorum yazılamadı (%s)."
+msgstr "‘%s’ dosyasına yorum yazılamadı: %s"
-#: ../src/tags/id3_tag.c:211
-#, fuzzy, c-format
-#| msgid ""
-#| "As the following corrupted file '%s' will cause an error in id3lib, it "
-#| "will not be processed"
-msgid ""
-"As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
-"not be processed"
-msgstr "'%s' dosyası id3lib ile ilgili hata verdi, işlenmeyecek"
+#: ../src/tags/id3_tag.c:212
+#, c-format
+msgid "As the following corrupted file ‘%s’ will cause an error in id3lib, it will not be processed"
+msgstr "‘%s’ dosyası id3lib ile ilgili hata verdi, işlenmeyecek"
-#: ../src/tags/id3_tag.c:213
+#: ../src/tags/id3_tag.c:214
msgid "Corrupted file"
msgstr "Bozuk Dosya"
-#: ../src/tags/id3_tag.c:595
-#, fuzzy, c-format
-#| msgid "Removed tag of '%s'"
+#: ../src/tags/id3_tag.c:603
+#, c-format
msgid "Removed tag of ‘%s’"
-msgstr "'%s' etiketi silindi"
+msgstr "‘%s’ etiketi silindi"
-#: ../src/tags/id3_tag.c:602 ../src/tags/id3_tag.c:729
-#, fuzzy, c-format
-#| msgid "Error while removing ID3v1 tag of '%s' (%s)"
+#: ../src/tags/id3_tag.c:610 ../src/tags/id3_tag.c:740
+#, c-format
msgid "Error while removing ID3v1 tag of ‘%s’: %s"
-msgstr "'%s' dosyasının ID3v1 etiketi silinemiyor (%s)"
+msgstr "‘%s’ dosyasının ID3v1 etiketi silinemiyor: %s"
-#: ../src/tags/id3_tag.c:611 ../src/tags/id3_tag.c:692
-#, fuzzy, c-format
-#| msgid "Error while removing ID3v2 tag of '%s' (%s)"
+#: ../src/tags/id3_tag.c:619 ../src/tags/id3_tag.c:703
+#, c-format
msgid "Error while removing ID3v2 tag of ‘%s’: %s"
-msgstr "'%s' dosyasının ID3v2 etiketi silinemiyor (%s)"
+msgstr "‘%s’ dosyasının ID3v2 etiketi silinemiyor: %s"
-#: ../src/tags/id3_tag.c:637
-#, fuzzy, c-format
-#| msgid "Error while updating ID3v2 tag of '%s' (%s)"
+#: ../src/tags/id3_tag.c:645
+#, c-format
msgid "Error while updating ID3v2 tag of ‘%s’: %s"
-msgstr "'%s' dosyasının ID3v2 etiketi güncellenemiyor (%s)"
+msgstr "‘%s’ dosyasının ID3v2 etiketi güncellenemiyor: %s"
-#: ../src/tags/id3_tag.c:667
-msgid ""
-"You have tried to save this tag to Unicode but it was detected that your "
-"version of id3lib is buggy"
-msgstr ""
-"Etiketi Unicode olarak yazmayı denediniz ama id3lib'in hatalı olduğu tespit "
-"edildi."
+#: ../src/tags/id3_tag.c:677
+msgid "You have tried to save this tag to Unicode but it was detected that your version of id3lib is buggy"
+msgstr "Etiketi Unicode olarak yazmayı denediniz ama id3lib'in hatalı olduğu tespit edildi."
-#: ../src/tags/id3_tag.c:669
+#: ../src/tags/id3_tag.c:679
#, c-format
msgid ""
-"If you reload this file, some characters in the tag may not be displayed "
-"correctly. Please, apply the patch src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which is available in "
-"the EasyTAG package sources.\n"
+"If you reload this file, some characters in the tag may not be displayed correctly. Please, apply the patch src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which is available in the EasyTAG package sources.\n"
"Note that this message will appear only once.\n"
"\n"
"File: %s"
msgstr ""
-"Bu dosyayı tekrar yüklerseniz etiketteki bazı karakterler doğru "
-"görünmeyebilir. Lütfen EasyTAG kaynak dosyalarında bulunan src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff yamasını id3lib'e uygulayın.\n"
+"Bu dosyayı tekrar yüklerseniz etiketteki bazı karakterler doğru görünmeyebilir. Lütfen EasyTAG kaynak dosyalarında bulunan src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff yamasını id3lib'e uygulayın.\n"
"Bu mesaj sadece bir kere görüntülenir.\n"
"\n"
"Dosya: %s"
-#: ../src/tags/id3_tag.c:676
+#: ../src/tags/id3_tag.c:686
msgid "Buggy id3lib"
msgstr "Hatalı id3lib"
-#: ../src/tags/id3_tag.c:717
-#, fuzzy, c-format
-#| msgid "Error while updating ID3v1 tag of '%s' (%s)"
+#: ../src/tags/id3_tag.c:728
+#, c-format
msgid "Error while updating ID3v1 tag of ‘%s’: %s"
-msgstr "'%s' dosyasının ID3v1 etiketi güncellenemiyor (%s)"
+msgstr "‘%s’ dosyasının ID3v1 etiketi güncellenemiyor: %s"
-#: ../src/tags/id3_tag.c:751
+#: ../src/tags/id3_tag.c:762
msgid "No error reported"
msgstr "Hata iletisi yok"
-#: ../src/tags/id3_tag.c:753
+#: ../src/tags/id3_tag.c:764
msgid "No available memory"
msgstr "Erişilebilir hafıza yok"
-#: ../src/tags/id3_tag.c:755
+#: ../src/tags/id3_tag.c:766
msgid "No data to parse"
msgstr "Ayrıştırılacak veri yok"
-#: ../src/tags/id3_tag.c:757
+#: ../src/tags/id3_tag.c:768
msgid "Improperly formatted data"
msgstr "Yanlış biçimlendirilmiş veri"
-#: ../src/tags/id3_tag.c:759
+#: ../src/tags/id3_tag.c:770
msgid "No buffer to write to"
msgstr "Yazmak için tampon yok"
-#: ../src/tags/id3_tag.c:761
+#: ../src/tags/id3_tag.c:772
msgid "Buffer is too small"
msgstr "Tampon çok küçük"
-#: ../src/tags/id3_tag.c:763
+#: ../src/tags/id3_tag.c:774
msgid "Invalid frame ID"
msgstr "Geçersiz katman ID"
-#: ../src/tags/id3_tag.c:765
+#: ../src/tags/id3_tag.c:776
msgid "Requested field not found"
msgstr "İstenen alan bulunamadı"
-#: ../src/tags/id3_tag.c:767
+#: ../src/tags/id3_tag.c:778
msgid "Unknown field type"
msgstr "Bilinmeyen alan tipi"
-#: ../src/tags/id3_tag.c:769
+#: ../src/tags/id3_tag.c:780
msgid "Tag is already attached to a file"
msgstr "Etiket zaten bir dosyaya eklendi"
-#: ../src/tags/id3_tag.c:771
+#: ../src/tags/id3_tag.c:782
msgid "Invalid tag version"
msgstr "Geçersiz etiket sürümü"
-#: ../src/tags/id3_tag.c:773
+#: ../src/tags/id3_tag.c:784
msgid "No file to parse"
msgstr "Ayrıştırılacak dosya yok"
-#: ../src/tags/id3_tag.c:775
+#: ../src/tags/id3_tag.c:786
msgid "Attempting to write to a read-only file"
msgstr "Salt okunur dosyaya yazmaya çalışıyor"
-#: ../src/tags/id3_tag.c:777
+#: ../src/tags/id3_tag.c:788
msgid "Error in compression/uncompression"
msgstr "Sıkıştırmada/açmada hata"
-#: ../src/tags/id3_tag.c:779
+#: ../src/tags/id3_tag.c:790
msgid "Unknown error message"
msgstr "Bilinmeyen hata iletisi"
-#: ../src/tags/id3_tag.c:1456
+#: ../src/tags/id3_tag.c:1467
msgid "Error while creating temporary file"
msgstr "Geçici dosya oluşturulamadı"
-#: ../src/tags/id3v24_tag.c:137 ../src/tags/id3v24_tag.c:192
-#: ../src/tags/id3v24_tag.c:230 ../src/tags/id3v24_tag.c:241
-#: ../src/tags/id3v24_tag.c:941 ../src/tags/id3v24_tag.c:948
-#: ../src/tags/id3v24_tag.c:974 ../src/tags/id3v24_tag.c:1014
-#: ../src/tags/mp4_tag.cc:95
-#, fuzzy
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/tags/id3v24_tag.c:132 ../src/tags/id3v24_tag.c:187
+#: ../src/tags/id3v24_tag.c:225 ../src/tags/id3v24_tag.c:236
+#: ../src/tags/id3v24_tag.c:951 ../src/tags/id3v24_tag.c:958
+#: ../src/tags/id3v24_tag.c:984 ../src/tags/id3v24_tag.c:1024
+#: ../src/tags/mp4_tag.cc:101 ../src/tags/ogg_header.c:277
msgid "Error reading tags from file"
-msgstr "'%s' dosyasından etiketler okunamadı"
+msgstr "Dosyadan etiketler okunamadı"
-#. Translators: The first string is a filename, the
-#. * second string is the number of bytes that were
-#. * missing (not read for some reason) while reading
-#. * from the file.
-#.
-#: ../src/tags/id3v24_tag.c:1678
-#, c-format
-msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
-msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
-msgstr[0] "'%s' dosyasına etiket yazılamıyor (%s bayt eksik)"
-
-#: ../src/tags/id3v24_tag.c:1701
-#, fuzzy, c-format
-#| msgid "Cannot save tag of file '%s'"
-msgid "Cannot save tag of file ‘%s’"
-msgstr "'%s' dosyasının etiketi kaydedilemiyor"
-
-#: ../src/tags/id3v24_tag.c:1713
-#, fuzzy, c-format
-#| msgid "Size error while saving tag of '%s'"
-msgid "Size error while saving tag of ‘%s’"
-msgstr "'%s' etiketi yazılırken boyut hatası oluştu"
-
-#: ../src/tags/monkeyaudio_header.c:47
-#, fuzzy
-#| msgid "Monkey's Audio File"
+#: ../src/tags/monkeyaudio_header.c:46
msgid "Error opening Monkey’s Audio file"
-msgstr "Monkey's Audio Dosyası"
+msgstr "Monkey's Audio dosyası açılamadı"
#. Mode changed to profile name
-#: ../src/tags/monkeyaudio_header.c:79 ../src/tags/musepack_header.c:82
+#: ../src/tags/monkeyaudio_header.c:78 ../src/tags/musepack_header.c:81
msgid "Profile:"
msgstr "Profil:"
-#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:86
-#: ../src/tags/mp4_tag.cc:282
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:92
+#: ../src/tags/mp4_tag.cc:288
msgid "MP4 format invalid"
msgstr "Geçersiz MP4 biçimi"
#: ../src/tags/mp4_header.cc:77
-#, fuzzy
-#| msgid "Error reading properties from file: '%s'"
msgid "Error reading properties from file"
-msgstr "'%s' dosyasından özellikler okunamadı"
+msgstr "Dosyadan özellikler okunamadı"
#: ../src/tags/mp4_header.cc:131
msgid "MP4/AAC File"
msgstr "MP4/AAC Dosyası"
-#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:236
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:241
#, c-format
msgid "~%d kb/s"
msgstr "~%d kb/s"
-#: ../src/tags/mp4_tag.cc:258 ../src/tags/mp4_tag.cc:275
-#: ../src/tags/mp4_tag.cc:281
-#, fuzzy, c-format
-#| msgid "Error while opening file: '%s' (%s)"
+#: ../src/tags/mp4_tag.cc:265 ../src/tags/mp4_tag.cc:281
+#: ../src/tags/mp4_tag.cc:287
+#, c-format
msgid "Error while opening file ‘%s’: %s"
-msgstr "Dosya açılırken hata oluştu: '%s' (%s)"
+msgstr "‘%s’ dosyası açılırken hata oluştu: %s"
-#: ../src/tags/mp4_tag.cc:293
-#, fuzzy, c-format
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/tags/mp4_tag.cc:298
+#, c-format
msgid "Error reading tags from file ‘%s’"
-msgstr "'%s' dosyasından etiketler okunamadı"
+msgstr "‘%s’ dosyasından etiketler okunamadı"
-#: ../src/tags/mpeg_header.c:51
+#: ../src/tags/mpeg_header.c:50
msgid "Stereo"
msgstr "Stereo"
-#: ../src/tags/mpeg_header.c:52
+#: ../src/tags/mpeg_header.c:51
msgid "Joint stereo"
msgstr "Ortak stereo"
-#: ../src/tags/mpeg_header.c:53
+#: ../src/tags/mpeg_header.c:52
msgid "Dual channel"
msgstr "Çift kanal"
-#: ../src/tags/mpeg_header.c:54
+#: ../src/tags/mpeg_header.c:53
msgid "Single channel"
msgstr "Tek kanal"
-#: ../src/tags/mpeg_header.c:206
+#: ../src/tags/mpeg_header.c:209
msgid "MP3 File"
msgstr "MP3 Dosyası"
-#: ../src/tags/mpeg_header.c:209
+#: ../src/tags/mpeg_header.c:213
msgid "MP2 File"
msgstr "MP2 Dosyası"
#. MPEG, Layer versions
-#: ../src/tags/mpeg_header.c:216
+#: ../src/tags/mpeg_header.c:221
msgid "MPEG"
msgstr "MPEG"
-#: ../src/tags/musepack_header.c:47
-#| msgid "Error while creating temporary file"
+#: ../src/tags/musepack_header.c:46
msgid "Error opening Musepack file"
msgstr "Musepack dosyası açılırken hata oluştu"
-#: ../src/tags/musepack_header.c:79
+#: ../src/tags/musepack_header.c:78
msgid "MusePack File"
msgstr "MusePack Dosyası"
-#: ../src/tags/ogg_header.c:244
-#, fuzzy
-#| msgid ""
-#| "Ogg Vorbis: The specified bitstream does not exist or the file has been "
-#| "initialized improperly (file: '%s')."
-msgid ""
-"The specified bitstream does not exist or the file has been initialized "
-"improperly"
-msgstr ""
-"Ogg Vorbis: Belirtilen veri akışı yok veya dosya yanlış başlatıldı. (dosya: "
-"'%s')."
+#: ../src/tags/ogg_header.c:243
+msgid "The specified bitstream does not exist or the file has been initialized improperly"
+msgstr "Belirtilen veri akışı yok veya dosya yanlış başlatıldı"
-#: ../src/tags/ogg_header.c:263
-#, fuzzy
-#| msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
+#: ../src/tags/ogg_header.c:262
msgid "Read from media returned an error"
-msgstr "Ogg Vorbis: Ortamdan okunamadı (dosya: '%s')."
+msgstr "Ortamdan okunamadı"
-#: ../src/tags/ogg_header.c:266
-#, fuzzy
-#| msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
+#: ../src/tags/ogg_header.c:265
msgid "Bitstream is not Vorbis data"
-msgstr "Ogg Vorbis: Veri akışı Vorbis verisi değil (file: '%s')."
+msgstr "Veri akışı Vorbis verisi değil"
-#: ../src/tags/ogg_header.c:269
-#, fuzzy
-#| msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
+#: ../src/tags/ogg_header.c:268
msgid "Vorbis version mismatch"
-msgstr "Ogg Vorbis: Vorbis sürümü eşleşmiyor (file: '%s')."
+msgstr "Vorbis sürümü eşleşmiyor"
-#: ../src/tags/ogg_header.c:272
-#, fuzzy
-#| msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
+#: ../src/tags/ogg_header.c:271
msgid "Invalid Vorbis bitstream header"
-msgstr "Ogg Vorbis: Geçersiz Vorbis veri akışı başlığı (dosya: '%s')."
+msgstr "Geçersiz Vorbis veri akışı başlığı"
-#: ../src/tags/ogg_header.c:275
-#, fuzzy
-#| msgid ""
-#| "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack "
-#| "corruption (file: '%s')."
+#: ../src/tags/ogg_header.c:274
msgid "Internal logic fault, indicates a bug or heap/stack corruption"
-msgstr ""
-"Ogg Vorbis: İçsel Mantık hatası, hata veya yığın bozulmasını gösterir "
-"(dosya: '%s')."
+msgstr "İçsel mantık hatası, hata veya yığın bozulmasını gösterir"
-#: ../src/tags/ogg_header.c:326
-#, fuzzy, c-format
-#| msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
+#: ../src/tags/ogg_header.c:325
+#, c-format
msgid "Failed to open file as Vorbis: %s"
-msgstr "Hata: '%s' dosyası Vorbis olarak açılamadı (%s)."
+msgstr "Vorbis dosya olarak açılamadı: %s"
-#: ../src/tags/ogg_header.c:389
+#: ../src/tags/ogg_header.c:387
msgid "Ogg Vorbis File"
msgstr "Ogg Vorbis Dosyası"
-#: ../src/tags/ogg_header.c:392
+#: ../src/tags/ogg_header.c:391
msgid "Speex File"
msgstr "Speex Dosyası"
-#: ../src/tags/opus_header.c:222
-#| msgid "MusePack File"
+#: ../src/tags/opus_header.c:223
msgid "Opus File"
msgstr "Opus Dosyası"
-#: ../src/tags/wavpack_header.c:83
+#: ../src/tags/wavpack_header.c:138
msgid "Wavpack File"
msgstr "Wavpack Dosyası"
+#, fuzzy
+#~| msgid "Can't load file: '%s' (%s)."
+
+#~ msgid "Cannot load file ‘%s’: %s"
+#~ msgstr "Dosya yüklenemiyor: '%s' (%s)."
+
+#, fuzzy
+#~| msgid "Cannot create or open file '%s' (%s)"
+
+#~ msgid "Cannot create or open file ‘%s’: %s"
+#~ msgstr "'%s' dosyası oluşturulamıyor veya okunamıyor (%s)"
+
+#, fuzzy
+#~| msgid "Error while writing list file: %s"
+
+#~ msgid "Error while writing list file ‘%s’"
+#~ msgstr "Dosya listesi yazılırken hata oluştu: %s"
+
+#, fuzzy
+#~| msgid "Migrating configuration from directory '%s' to '%s'"
+
+#~ msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
+#~ msgstr "Yapılandırma '%s' dizininden '%s' dizinine taşınıyor."
+
+#, fuzzy
+#~| msgid "Failed to migrate configuration file '%s'"
+
+#~ msgid "Failed to migrate configuration file ‘%s’"
+#~ msgstr "'%s' yapılandırma dosyası taşınamadı"
+
+#, fuzzy
+#~| msgid "Cannot create target directory '%s': %s"
+
+#~ msgid "Cannot create directory ‘%s’: %s"
+#~ msgstr "'%s' hedef dizini oluşturulamıyor: %s"
+
+#~ msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
+
+#~ msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
+#~ msgstr[0] "'%s' dosyasına etiket yazılamıyor (%s bayt eksik)"
+
+#, fuzzy
+#~| msgid "Cannot save tag of file '%s'"
+
+#~ msgid "Cannot save tag of file ‘%s’"
+#~ msgstr "'%s' dosyasının etiketi kaydedilemiyor"
+
+#, fuzzy
+#~| msgid "Size error while saving tag of '%s'"
+
+#~ msgid "Size error while saving tag of ‘%s’"
+#~ msgstr "'%s' etiketi yazılırken boyut hatası oluştu"
+
#~ msgid ""
#~ "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 "
@@ -6649,11 +5793,13 @@ msgstr "Wavpack Dosyası"
#, fuzzy
#~| msgid "Error while opening file: '%s' (%s)."
+
#~ msgid "Error copying file '%s' to '%s'"
#~ msgstr "Dosya açılamadı: '%s' (%s)."
#, fuzzy
#~| msgid "Cannot create or open file '%s' (%s)"
+
#~ msgid "Cannot change permissions of file '%s' (%s)"
#~ msgstr "'%s' dosyası oluşturulamıyor veya okunamıyor (%s)"
diff --git a/src/application.c b/src/application.c
index 05bf14c..30ed234 100644
--- a/src/application.c
+++ b/src/application.c
@@ -320,7 +320,7 @@ et_application_local_command_line (GApplication *application,
n_args = g_strv_length (argv);
*exit_status = 0;
- g_debug ("Received %d commandline arguments", n_args);
+ g_debug ("Received %u commandline arguments", n_args);
if (n_args <= 1)
{
diff --git a/src/application_window.c b/src/application_window.c
index 7a84885..6c5eb2f 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -24,12 +24,28 @@
#include "browser.h"
#include "cddb_dialog.h"
+#include "charset.h"
#include "easytag.h"
#include "file_area.h"
#include "file_list.h"
+#ifdef ENABLE_FLAC
+#include "flac_header.h"
+#endif
#include "load_files_dialog.h"
#include "log.h"
#include "misc.h"
+#ifdef ENABLE_MP4
+#include "mp4_header.h"
+#endif
+#include "mpeg_header.h"
+#include "monkeyaudio_header.h"
+#include "musepack_header.h"
+#ifdef ENABLE_OGG
+#include "ogg_header.h"
+#endif
+#ifdef ENABLE_OPUS
+#include "opus_header.h"
+#endif
#include "picture.h"
#include "playlist_dialog.h"
#include "preferences_dialog.h"
@@ -40,6 +56,9 @@
#include "setting.h"
#include "status_bar.h"
#include "tag_area.h"
+#ifdef ENABLE_WAVPACK
+#include "wavpack_header.h"
+#endif
/* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
G_DEFINE_TYPE (EtApplicationWindow, et_application_window, GTK_TYPE_APPLICATION_WINDOW)
@@ -428,8 +447,7 @@ on_invert_selection (GSimpleAction *action,
priv = et_application_window_get_instance_private (self);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
et_browser_invert_selection (ET_BROWSER (priv->browser));
et_application_window_update_actions (self);
@@ -462,8 +480,7 @@ on_delete (GSimpleAction *action,
self = ET_APPLICATION_WINDOW (user_data);
priv = et_application_window_get_instance_private (self);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
/* Number of files to save */
selection = et_application_window_browser_get_selection (self);
@@ -505,7 +522,7 @@ on_delete (GSimpleAction *action,
path);
gtk_tree_path_free (path);
- ET_Display_File_Data_To_UI(ETFile);
+ et_application_window_display_et_file (self, ETFile);
et_application_window_browser_select_file_by_et_file (self, ETFile,
FALSE);
fraction = (++progress_bar_index) / (double) nb_files_to_delete;
@@ -568,7 +585,9 @@ on_delete (GSimpleAction *action,
/* It's important to displayed the new item, as it'll check the changes in et_browser_toggle_display_mode. */
if (ETCore->ETFileDisplayed)
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+ {
+ et_application_window_display_et_file (self, ETCore->ETFileDisplayed);
+ }
/*else if (ET_Displayed_File_List_Current())
ET_Display_File_Data_To_UI((ET_File *)ET_Displayed_File_List_Current()->data);*/
@@ -610,8 +629,7 @@ on_undo_file_changes (GSimpleAction *action,
self = ET_APPLICATION_WINDOW (user_data);
priv = et_application_window_get_instance_private (self);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
selection = et_application_window_browser_get_selection (self);
selfilelist = gtk_tree_selection_get_selected_rows(selection, NULL);
@@ -629,7 +647,7 @@ on_undo_file_changes (GSimpleAction *action,
et_application_window_browser_refresh_list (self);
/* Display the current file */
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (self, ETCore->ETFileDisplayed);
et_application_window_update_actions (self);
//ET_Debug_Print_File_List(ETCore->ETFileList,__FILE__,__LINE__,__FUNCTION__);
@@ -653,8 +671,7 @@ on_redo_file_changes (GSimpleAction *action,
self = ET_APPLICATION_WINDOW (user_data);
priv = et_application_window_get_instance_private (self);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
selection = et_application_window_browser_get_selection (ET_APPLICATION_WINDOW (user_data));
selfilelist = gtk_tree_selection_get_selected_rows(selection, NULL);
@@ -672,7 +689,7 @@ on_redo_file_changes (GSimpleAction *action,
et_application_window_browser_refresh_list (ET_APPLICATION_WINDOW (user_data));
/* Display the current file */
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (self, ETCore->ETFileDisplayed);
et_application_window_update_actions (self);
}
@@ -738,8 +755,7 @@ on_select_all (GSimpleAction *action,
focused))
/* Assume that other widgets should select all in the file view. */
{
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
et_browser_select_all (ET_BROWSER (priv->browser));
et_application_window_update_actions (self);
@@ -774,8 +790,7 @@ on_unselect_all (GSimpleAction *action,
focused))
/* Assume that other widgets should unselect all in the file view. */
{
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
et_browser_unselect_all (ET_BROWSER (priv->browser));
@@ -795,14 +810,13 @@ on_undo_last_changes (GSimpleAction *action,
g_return_if_fail (ETCore->ETFileList != NULL);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
ETFile = ET_Undo_History_File_Data ();
if (ETFile)
{
- ET_Display_File_Data_To_UI (ETFile);
+ et_application_window_display_et_file (self, ETFile);
et_application_window_browser_select_file_by_et_file (self, ETFile,
TRUE);
et_application_window_browser_refresh_file_in_list (self, ETFile);
@@ -823,14 +837,13 @@ on_redo_last_changes (GSimpleAction *action,
g_return_if_fail (ETCore->ETFileDisplayedList != NULL);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
ETFile = ET_Redo_History_File_Data ();
if (ETFile)
{
- ET_Display_File_Data_To_UI (ETFile);
+ et_application_window_display_et_file (self, ETFile);
et_application_window_browser_select_file_by_et_file (self, ETFile,
TRUE);
et_application_window_browser_refresh_file_in_list (self, ETFile);
@@ -860,8 +873,7 @@ on_remove_tags (GSimpleAction *action,
self = ET_APPLICATION_WINDOW (user_data);
priv = et_application_window_get_instance_private (self);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
/* Initialize status bar */
et_application_window_progress_set_fraction (self, 0.0);
@@ -893,7 +905,7 @@ on_remove_tags (GSimpleAction *action,
et_application_window_browser_refresh_list (self);
/* Display the current file */
- ET_Display_File_Data_To_UI (ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (self, ETCore->ETFileDisplayed);
et_application_window_update_actions (self);
et_application_window_progress_set_fraction (self, 0.0);
@@ -1002,8 +1014,7 @@ on_file_artist_view_change (GSimpleAction *action,
g_return_if_fail (ETCore->ETFileDisplayedList != NULL);
- /* Save the current displayed data. */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
if (strcmp (state, "file") == 0)
{
@@ -1261,34 +1272,20 @@ on_go_default (GSimpleAction *action,
}
static void
-on_go_first (GSimpleAction *action,
- GVariant *variant,
- gpointer user_data)
+update_ui_for_et_file (EtApplicationWindow *self,
+ ET_File *et_file)
{
EtApplicationWindowPrivate *priv;
- EtApplicationWindow *self;
- GList *etfilelist;
- self = ET_APPLICATION_WINDOW (user_data);
priv = et_application_window_get_instance_private (self);
- if (!ETCore->ETFileDisplayedList)
- return;
-
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
-
- /* Go to the first item of the list */
- etfilelist = ET_Displayed_File_List_First ();
-
- if (etfilelist)
+ if (et_file)
{
/* To avoid the last line still selected. */
et_browser_unselect_all (ET_BROWSER (priv->browser));
- et_application_window_browser_select_file_by_et_file (self,
- (ET_File *)etfilelist->data,
+ et_application_window_browser_select_file_by_et_file (self, et_file,
TRUE);
- ET_Display_File_Data_To_UI ((ET_File *)etfilelist->data);
+ et_application_window_display_et_file (self, et_file);
}
et_application_window_update_actions (self);
@@ -1301,42 +1298,46 @@ on_go_first (GSimpleAction *action,
}
static void
+on_go_first (GSimpleAction *action,
+ GVariant *variant,
+ gpointer user_data)
+{
+ EtApplicationWindow *self;
+ GList *etfilelist;
+
+ self = ET_APPLICATION_WINDOW (user_data);
+
+ g_return_if_fail (ETCore->ETFileDisplayedList);
+
+ et_application_window_update_et_file_from_ui (self);
+
+ /* Go to the first item of the list */
+ etfilelist = ET_Displayed_File_List_First ();
+
+ update_ui_for_et_file (self, etfilelist ? (ET_File *)etfilelist->data
+ : NULL);
+}
+
+static void
on_go_previous (GSimpleAction *action,
GVariant *variant,
gpointer user_data)
{
- EtApplicationWindowPrivate *priv;
EtApplicationWindow *self;
GList *etfilelist;
self = ET_APPLICATION_WINDOW (user_data);
- priv = et_application_window_get_instance_private (self);
- if (!ETCore->ETFileDisplayedList || !ETCore->ETFileDisplayedList->prev)
- return;
+ g_return_if_fail (ETCore->ETFileDisplayedList
+ && ETCore->ETFileDisplayedList->prev);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
/* Go to the prev item of the list */
etfilelist = ET_Displayed_File_List_Previous ();
- if (etfilelist)
- {
- et_browser_unselect_all (ET_BROWSER (priv->browser));
- et_application_window_browser_select_file_by_et_file (self,
- (ET_File *)etfilelist->data,
- TRUE);
- ET_Display_File_Data_To_UI((ET_File *)etfilelist->data);
- }
-
- et_application_window_update_actions (self);
- et_application_window_scan_dialog_update_previews (self);
-
- if (!g_settings_get_boolean (MainSettings, "tag-preserve-focus"))
- {
- et_tag_area_title_grab_focus (ET_TAG_AREA (priv->tag_area));
- }
+ update_ui_for_et_file (self, etfilelist ? (ET_File *)etfilelist->data
+ : NULL);
}
static void
@@ -1344,38 +1345,21 @@ on_go_next (GSimpleAction *action,
GVariant *variant,
gpointer user_data)
{
- EtApplicationWindowPrivate *priv;
EtApplicationWindow *self;
GList *etfilelist;
self = ET_APPLICATION_WINDOW (user_data);
- priv = et_application_window_get_instance_private (self);
- if (!ETCore->ETFileDisplayedList || !ETCore->ETFileDisplayedList->next)
- return;
+ g_return_if_fail (ETCore->ETFileDisplayedList
+ && ETCore->ETFileDisplayedList->next);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
/* Go to the next item of the list */
etfilelist = ET_Displayed_File_List_Next ();
- if (etfilelist)
- {
- et_browser_unselect_all (ET_BROWSER (priv->browser));
- et_application_window_browser_select_file_by_et_file (self,
- (ET_File *)etfilelist->data,
- TRUE);
- ET_Display_File_Data_To_UI((ET_File *)etfilelist->data);
- }
-
- et_application_window_update_actions (self);
- et_application_window_scan_dialog_update_previews (self);
-
- if (!g_settings_get_boolean (MainSettings, "tag-preserve-focus"))
- {
- et_tag_area_title_grab_focus (ET_TAG_AREA (priv->tag_area));
- }
+ update_ui_for_et_file (self, etfilelist ? (ET_File *)etfilelist->data
+ : NULL);
}
static void
@@ -1383,38 +1367,21 @@ on_go_last (GSimpleAction *action,
GVariant *variant,
gpointer user_data)
{
- EtApplicationWindowPrivate *priv;
EtApplicationWindow *self;
GList *etfilelist;
self = ET_APPLICATION_WINDOW (user_data);
- priv = et_application_window_get_instance_private (self);
- if (!ETCore->ETFileDisplayedList || !ETCore->ETFileDisplayedList->next)
- return;
+ g_return_if_fail (ETCore->ETFileDisplayedList
+ && ETCore->ETFileDisplayedList->next);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
/* Go to the last item of the list */
etfilelist = ET_Displayed_File_List_Last ();
- if (etfilelist)
- {
- et_browser_unselect_all (ET_BROWSER (priv->browser));
- et_application_window_browser_select_file_by_et_file (self,
- (ET_File *)etfilelist->data,
- TRUE);
- ET_Display_File_Data_To_UI ((ET_File *)etfilelist->data);
- }
-
- et_application_window_update_actions (self);
- et_application_window_scan_dialog_update_previews (self);
-
- if (!g_settings_get_boolean (MainSettings, "tag-preserve-focus"))
- {
- et_tag_area_title_grab_focus (ET_TAG_AREA (priv->tag_area));
- }
+ update_ui_for_et_file (self, etfilelist ? (ET_File *)etfilelist->data
+ : NULL);
}
static void
@@ -1997,19 +1964,373 @@ et_application_window_select_file_by_et_file (EtApplicationWindow *self,
if (!ETCore->ETFileDisplayedList)
return;
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
/* Display the item */
et_application_window_browser_select_file_by_et_file (self, ETFile, TRUE);
/* Just to update 'ETFileDisplayedList'. */
ET_Displayed_File_List_By_Etfile (ETFile);
- ET_Display_File_Data_To_UI (ETFile);
+ et_application_window_display_et_file (self, ETFile);
et_application_window_update_actions (self);
et_application_window_scan_dialog_update_previews (self);
}
+/*
+ * Save displayed filename into list if it had been changed. Generates also an history list for undo/redo.
+ * - ETFile : the current etfile that we want to save,
+ * - FileName : where is 'temporary' saved the new filename.
+ *
+ * Note : it builds new filename (with path) from strings encoded into file system
+ * encoding, not UTF-8 (it preserves file system encoding of parent directories).
+ */
+static void
+et_application_window_update_file_name_from_ui (EtApplicationWindow *self,
+ const ET_File *ETFile,
+ File_Name *FileName)
+{
+ gchar *filename_new = NULL;
+ gchar *dirname = NULL;
+ gchar *filename;
+ const gchar *filename_utf8;
+ gchar *extension;
+
+ g_return_if_fail (ETFile != NULL && FileName != NULL);
+
+ filename_utf8 = et_application_window_file_area_get_filename (self);
+ filename = filename_from_display (filename_utf8);
+
+ if (!filename)
+ {
+ /* If conversion fails... */
+ GtkWidget *msgdialog;
+ gchar *filename_escaped_utf8 = g_strescape(filename_utf8, NULL);
+ msgdialog = gtk_message_dialog_new (GTK_WINDOW (self),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ _("Could not convert filename ‘%s’ to system filename encoding"),
+ filename_escaped_utf8);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
+ _("Try setting the environment variable G_FILENAME_ENCODING."));
+ gtk_window_set_title (GTK_WINDOW (msgdialog),
+ _("Filename translation"));
+
+ gtk_dialog_run (GTK_DIALOG (msgdialog));
+ gtk_widget_destroy (msgdialog);
+ g_free (filename_escaped_utf8);
+ return;
+ }
+
+ /* Get the current path to the file. */
+ dirname = g_path_get_dirname (((File_Name *)ETFile->FileNameNew->data)->value);
+
+ /* Convert filename extension (lower or upper). */
+ extension = ET_File_Format_File_Extension (ETFile);
+
+ // Check length of filename (limit ~255 characters)
+ //ET_File_Name_Check_Length(ETFile,filename);
+
+ /* Filename (in file system encoding!). */
+ if (filename && *filename)
+ {
+ /* Regenerate the new filename (without path). */
+ filename_new = g_strconcat (filename, extension, NULL);
+ }
+ else
+ {
+ /* Keep the 'last' filename (if a 'blank' filename was entered in the
+ * fileentry for example). */
+ filename_new = g_path_get_basename (((File_Name *)ETFile->FileNameNew->data)->value);
+ }
+
+ g_free (filename);
+ g_free (extension);
+
+ et_file_name_set_from_components (FileName, filename_new, dirname,
+ g_settings_get_boolean (MainSettings,
+ "rename-replace-illegal-chars"));
+
+ g_free (filename_new);
+ g_free (dirname);
+ return;
+}
+
+void
+et_application_window_update_et_file_from_ui (EtApplicationWindow *self)
+{
+ const ET_File_Description *description;
+ ET_File *et_file;
+ File_Name *FileName;
+ File_Tag *FileTag;
+ const gchar *cur_filename_utf8;
+
+ if (!ETCore->ETFileDisplayed)
+ {
+ return;
+ }
+
+ et_file = ETCore->ETFileDisplayed;
+
+ g_return_if_fail (et_file != NULL && et_file->FileNameCur != NULL
+ && et_file->FileNameCur->data != NULL);
+
+ /* Save the current displayed data */
+ cur_filename_utf8 = ((File_Name *)((GList *)et_file->FileNameCur)->data)->value_utf8;
+ description = et_file->ETFileDescription;
+
+ /* Save filename and generate undo for filename. */
+ FileName = et_file_name_new ();
+ et_application_window_update_file_name_from_ui (self, et_file, FileName);
+
+ switch (description->TagType)
+ {
+#ifdef ENABLE_MP3
+ case ID3_TAG:
+#endif
+#ifdef ENABLE_OGG
+ case OGG_TAG:
+#endif
+#ifdef ENABLE_FLAC
+ case FLAC_TAG:
+#endif
+#ifdef ENABLE_MP4
+ case MP4_TAG:
+#endif
+#ifdef ENABLE_WAVPACK
+ case WAVPACK_TAG:
+#endif
+#ifdef ENABLE_OPUS
+ case OPUS_TAG:
+#endif
+ case APE_TAG:
+ FileTag = et_application_window_tag_area_create_file_tag (self);
+ et_file_tag_copy_other_into (et_file->FileTag->data, FileTag);
+ break;
+ case UNKNOWN_TAG:
+ default:
+ FileTag = et_file_tag_new ();
+ Log_Print (LOG_ERROR,
+ "FileTag: Undefined tag type %d for file %s.",
+ (gint)description->TagType, cur_filename_utf8);
+ break;
+ }
+
+ /*
+ * Generate undo for the file and the main undo list.
+ * If no changes detected, FileName and FileTag item are deleted.
+ */
+ ET_Manage_Changes_Of_File_Data (et_file, FileName, FileTag);
+
+ /* Refresh file into browser list */
+ et_application_window_browser_refresh_file_in_list (self, et_file);
+}
+
+static void
+et_file_header_fields_free (EtFileHeaderFields *fields)
+{
+ g_free (fields->version);
+ g_free (fields->bitrate);
+ g_free (fields->samplerate);
+ g_free (fields->mode);
+ g_free (fields->size);
+ g_free (fields->duration);
+ g_slice_free (EtFileHeaderFields, fields);
+}
+
+static void
+et_application_window_display_file_name (EtApplicationWindow *self,
+ const ET_File *ETFile)
+{
+ const gchar *new_filename_utf8;
+ gchar *dirname_utf8;
+ gchar *text;
+
+ g_return_if_fail (ETFile != NULL);
+
+ new_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameNew)->data)->value_utf8;
+
+ /*
+ * Set the path to the file into BrowserEntry (dirbrowser)
+ */
+ dirname_utf8 = g_path_get_dirname (new_filename_utf8);
+ et_application_window_browser_entry_set_text (self, dirname_utf8);
+
+ // And refresh the number of files in this directory
+ text = g_strdup_printf (ngettext ("One file", "%u files",
+ et_file_list_get_n_files_in_path (ETCore->ETFileList,
+ dirname_utf8)),
+ et_file_list_get_n_files_in_path (ETCore->ETFileList,
+ dirname_utf8));
+ et_application_window_browser_label_set_text (self, text);
+ g_free(dirname_utf8);
+ g_free(text);
+}
+
+/*
+ * "Default" way to display File Info to the user interface.
+ */
+static EtFileHeaderFields *
+et_header_fields_new_from_unknown (const ET_File *ETFile)
+{
+ EtFileHeaderFields *fields;
+ ET_File_Info *info;
+ gchar *time = NULL;
+ gchar *time1 = NULL;
+ gchar *size = NULL;
+ gchar *size1 = NULL;
+
+ info = ETFile->ETFileInfo;
+ fields = g_slice_new (EtFileHeaderFields);
+
+ fields->description = _("File");
+
+ /* MPEG, Layer versions */
+ fields->version = g_strdup_printf ("%d, Layer %" G_GSIZE_FORMAT,
+ info->version, info->layer);
+
+ /* Bitrate */
+ fields->bitrate = g_strdup_printf (_("%d kb/s"), info->bitrate);
+
+ /* Samplerate */
+ fields->samplerate = g_strdup_printf (_("%d Hz"), info->samplerate);
+
+ /* Mode */
+ fields->mode = g_strdup_printf ("%d", info->mode);
+
+ /* Size */
+ size = g_format_size (info->size);
+ size1 = g_format_size (ETCore->ETFileDisplayedList_TotalSize);
+ fields->size = g_strdup_printf ("%s (%s)", size, size1);
+ g_free (size);
+ g_free (size1);
+
+ /* Duration */
+ time = Convert_Duration (info->duration);
+ time1 = Convert_Duration (ETCore->ETFileDisplayedList_TotalDuration);
+ fields->duration = g_strdup_printf ("%s (%s)", time, time1);
+ g_free (time);
+ g_free (time1);
+
+ return fields;
+}
+
+/*
+ * Display information of the file (Position + Header + Tag) to the user interface.
+ * Before doing it, it saves data of the file currently displayed
+ */
+void
+et_application_window_display_et_file (EtApplicationWindow *self,
+ ET_File *ETFile)
+{
+ const ET_File_Description *description;
+ const gchar *cur_filename_utf8;
+ gchar *msg;
+ EtFileHeaderFields *fields;
+
+ g_return_if_fail (ETFile != NULL &&
+ ((GList *)ETFile->FileNameCur)->data != NULL);
+ /* For the case where ETFile is an "empty" structure. */
+
+ cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
+ description = ETFile->ETFileDescription;
+
+ /* Save the current displayed file */
+ ETCore->ETFileDisplayed = ETFile;
+
+ /* Display position in list + show/hide icon if file writable/read_only (cur_filename) */
+ et_application_window_file_area_set_file_fields (self, ETFile);
+
+ /* Display filename (and his path) (value in FileNameNew) */
+ et_application_window_display_file_name (self, ETFile);
+
+ /* Display tag data */
+ et_application_window_tag_area_display_et_file (self, ETFile);
+
+ /* Display controls in tag area */
+ et_application_window_tag_area_display_controls (self, ETFile);
+
+ /* Display file data, header data and file type */
+ switch (description->FileType)
+ {
+#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
+ case MP3_FILE:
+ case MP2_FILE:
+ fields = et_mpeg_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_mpeg_file_header_fields_free (fields);
+ break;
+#endif
+#ifdef ENABLE_OGG
+ case OGG_FILE:
+ fields = et_ogg_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_ogg_file_header_fields_free (fields);
+ break;
+#endif
+#ifdef ENABLE_SPEEX
+ case SPEEX_FILE:
+ fields = et_ogg_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_ogg_file_header_fields_free (fields);
+ break;
+#endif
+#ifdef ENABLE_FLAC
+ case FLAC_FILE:
+ fields = et_flac_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_flac_file_header_fields_free (fields);
+ break;
+#endif
+ case MPC_FILE:
+ fields = et_mpc_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_mpc_file_header_fields_free (fields);
+ break;
+ case MAC_FILE:
+ fields = et_mac_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_mac_file_header_fields_free (fields);
+ break;
+#ifdef ENABLE_MP4
+ case MP4_FILE:
+ fields = et_mp4_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_mp4_file_header_fields_free (fields);
+ break;
+#endif
+#ifdef ENABLE_WAVPACK
+ case WAVPACK_FILE:
+ fields = et_wavpack_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_wavpack_file_header_fields_free (fields);
+ break;
+#endif
+#ifdef ENABLE_OPUS
+ case OPUS_FILE:
+ fields = et_opus_header_display_file_info_to_ui (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_opus_file_header_fields_free (fields);
+ break;
+#endif
+ case OFR_FILE:
+ case UNKNOWN_FILE:
+ default:
+ /* Default displaying. */
+ fields = et_header_fields_new_from_unknown (ETFile);
+ et_application_window_file_area_set_header_fields (self, fields);
+ et_file_header_fields_free (fields);
+ Log_Print (LOG_ERROR,
+ "ETFileInfo: Undefined file type %d for file %s.",
+ (gint)description->FileType, cur_filename_utf8);
+ break;
+ }
+
+ msg = g_strdup_printf (_("File: ‘%s’"), cur_filename_utf8);
+ et_application_window_status_bar_message (self, msg, FALSE);
+ g_free (msg);
+}
+
const gchar *
et_application_window_get_current_path (EtApplicationWindow *self)
{
@@ -2594,8 +2915,7 @@ et_application_window_browser_unselect_all (EtApplicationWindow *self)
priv = et_application_window_get_instance_private (self);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (self);
et_browser_unselect_all (ET_BROWSER (priv->browser));
ETCore->ETFileDisplayed = NULL;
@@ -2655,10 +2975,7 @@ et_application_window_quit (EtApplicationWindow *self)
gint response;
/* If you change the displayed data and quit immediately */
- if (ETCore->ETFileList)
- {
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
- }
+ et_application_window_update_et_file_from_ui (self);
/* Check if all files have been saved before exit */
if (g_settings_get_boolean (MainSettings, "confirm-when-unsaved-files")
diff --git a/src/application_window.h b/src/application_window.h
index 2a3a623..8bd8153 100644
--- a/src/application_window.h
+++ b/src/application_window.h
@@ -81,6 +81,8 @@ GtkTreeSelection * et_application_window_browser_get_selection (EtApplicationWin
GtkTreeViewColumn *et_application_window_browser_get_column_for_column_id (EtApplicationWindow *self, gint column_id);
GtkSortType et_application_window_browser_get_sort_order_for_column_id (EtApplicationWindow *self, gint column_id);
void et_application_window_browser_select_file_by_iter_string (EtApplicationWindow *self, const gchar *iter_string, gboolean select);
+void et_application_window_update_et_file_from_ui (EtApplicationWindow *self);
+void et_application_window_display_et_file (EtApplicationWindow *self, ET_File *ETFile);
void et_application_window_browser_select_file_by_et_file (EtApplicationWindow *self, const ET_File *file, gboolean select);
GtkTreePath * et_application_window_browser_select_file_by_et_file2 (EtApplicationWindow *self, const ET_File *file, gboolean select, GtkTreePath *start_path);
ET_File * et_application_window_browser_select_file_by_dlm (EtApplicationWindow *self, const gchar *string, gboolean select);
diff --git a/src/browser.c b/src/browser.c
index a088230..fa0809a 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -102,13 +102,6 @@ struct _EtBrowserPrivate
gchar *current_path;
};
-/****************
- * Declarations *
- ****************/
-
-
-static const guint BOX_SPACING = 6;
-
/*
* EtPathState:
* @ET_PATH_STATE_OPEN: the path is open or has been read
@@ -845,8 +838,8 @@ Browser_Tree_Node_Selected (EtBrowser *self, GtkTreeSelection *selection)
if (!pathName)
return FALSE;
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
+
/* FIXME: Not clean to put this here. */
et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
@@ -1065,7 +1058,7 @@ et_browser_select_dir (EtBrowser *self, const gchar *current_path)
while (parts[index]) // it is NULL-terminated
{
- if (strlen(parts[index]) == 0)
+ if (parts[index] == '\0')
{
index++;
continue;
@@ -1079,8 +1072,7 @@ et_browser_select_dir (EtBrowser *self, const gchar *current_path)
gtk_tree_model_get (GTK_TREE_MODEL (priv->directory_model),
&parentNode, TREE_COLUMN_FULL_PATH,
&parent_path, -1);
- path = g_build_path (G_DIR_SEPARATOR_S, parent_path, parts[index],
- NULL);
+ path = g_build_filename (parent_path, parts[index], NULL);
g_free (parent_path);
file = g_file_new_for_path (path);
@@ -2405,7 +2397,7 @@ Browser_Artist_List_Load_Files (EtBrowser *self, ET_File *etfile_to_select)
gtk_tree_model_get(GTK_TREE_MODEL(priv->artist_model), &iter,
ARTIST_ALBUM_LIST_POINTER, &AlbumList,
-1);
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
Browser_Album_List_Load_Files (self, AlbumList,NULL);
}
}
@@ -2427,8 +2419,7 @@ Browser_Artist_List_Row_Selected (EtBrowser *self, GtkTreeSelection* selection)
if(!gtk_tree_selection_get_selected(selection, NULL, &iter))
return; // We might be called with no row selected
- // Save the current displayed data
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
gtk_tree_model_get (GTK_TREE_MODEL (priv->artist_model), &iter,
ARTIST_ALBUM_LIST_POINTER, &AlbumList, -1);
@@ -2634,7 +2625,7 @@ Browser_Album_List_Load_Files (EtBrowser *self,
gtk_tree_model_get(GTK_TREE_MODEL(priv->album_model), &iter,
ALBUM_ETFILE_LIST_POINTER, &etfilelist,
-1);
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
/* Set the attached list as "Displayed List". */
et_displayed_file_list_set (etfilelist);
@@ -2665,8 +2656,7 @@ Browser_Album_List_Row_Selected (EtBrowser *self, GtkTreeSelection *selection)
gtk_tree_model_get (GTK_TREE_MODEL (priv->album_model), &iter,
ALBUM_ETFILE_LIST_POINTER, &etfilelist, -1);
- // Save the current displayed data
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
/* Set the attached list as "Displayed List". */
et_displayed_file_list_set (etfilelist);
@@ -2734,8 +2724,7 @@ et_browser_set_display_mode (EtBrowser *self,
priv = et_browser_get_instance_private (self);
- /* Save the current displayed data. */
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
switch (mode)
{
@@ -3162,7 +3151,7 @@ et_browser_reload (EtBrowser *self)
/* If no node selected, get path from BrowserEntry or default path */
if (priv->current_path != NULL)
current_path = g_strdup(priv->current_path);
- else if (g_utf8_strlen(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->entry_combo)))), -1) > 0)
+ else if (*(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->entry_combo))))))
current_path = filename_from_display(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->entry_combo)))));
else
{
@@ -4181,7 +4170,7 @@ et_browser_show_rename_directory_dialog (EtBrowser *self)
directory_name = g_strdup(address+1);
*(address+1) = 0;
- if (!directory_name || strlen(directory_name)==0)
+ if (et_str_empty (directory_name))
{
g_free(directory_name);
g_free(directory_parent);
@@ -4348,7 +4337,7 @@ Rename_Directory (EtBrowser *self)
}
/* Check if a name for the directory have been supplied */
- if (!directory_new_name || g_utf8_strlen(directory_new_name, -1) < 1)
+ if (et_str_empty (directory_new_name))
{
GtkWidget *msgdialog;
@@ -4542,7 +4531,8 @@ Rename_Directory (EtBrowser *self)
// To update file path in the browser entry
if (ETCore->ETFileDisplayedList)
{
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (ET_APPLICATION_WINDOW (MainWindow),
+ ETCore->ETFileDisplayed);
}else
{
gchar *tmp = filename_to_display (et_browser_get_current_path (self));
@@ -4602,10 +4592,12 @@ et_browser_show_open_directory_with_dialog (EtBrowser *self)
}
/* Current directory. */
- current_directory = g_strdup (priv->current_path);
-
- if (!current_directory || strlen(current_directory)==0)
+ if (et_str_empty (priv->current_path))
+ {
return;
+ }
+
+ current_directory = g_strdup (priv->current_path);
builder = gtk_builder_new ();
gtk_builder_add_from_resource (builder,
diff --git a/src/cddb_dialog.c b/src/cddb_dialog.c
index 01d6313..c71bfd3 100644
--- a/src/cddb_dialog.c
+++ b/src/cddb_dialog.c
@@ -179,6 +179,7 @@ static const gchar *cddb_genre_vs_id3_genre [][2] =
static const gchar CDDB_RESULT_FILE[] = "cddb_result_file.tmp";
static const guint BOX_SPACING = 6;
+static const guint MAX_STRING_LEN = 1024;
/**************
@@ -235,7 +236,7 @@ update_search_button_sensitivity (EtCDDBDialog *self)
priv = et_cddb_dialog_get_instance_private (self);
if (priv->search_button
- && g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (priv->search_string_entry)), -1) > 0
+ && *(gtk_entry_get_text (GTK_ENTRY (priv->search_string_entry)))
&& (g_settings_get_flags (MainSettings, "cddb-search-fields") != 0)
&& (g_settings_get_flags (MainSettings, "cddb-search-categories") != 0))
{
@@ -898,10 +899,12 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
{
// For gnudb
// New version of gnudb doesn't use a cddb request, but a http request
+ /* HTTP/1.0 to avoid the server returning chunked results.
+ * https://bugzilla.gnome.org/show_bug.cgi?id=743812 */
cddb_in = g_strdup_printf("GET %s%s/gnudb/"
"%s/%s"
- " HTTP/1.1\r\n"
- "Host: %s:%d\r\n"
+ " HTTP/1.0\r\n"
+ "Host: %s:%u\r\n"
"User-Agent: %s %s\r\n"
"%s"
"Connection: close\r\n"
@@ -918,11 +921,13 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
// CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
// Without proxy : "GET /~cddb/cddb.cgi?…" but doesn't work with a proxy.
// With proxy : "GET http://freedb.freedb.org/~cddb/cddb.cgi?…"
+ /* HTTP/1.0 to avoid the server returning chunked results.
+ * https://bugzilla.gnome.org/show_bug.cgi?id=743812 */
cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
"%s+%s"
"&hello=noname+localhost+%s+%s"
- "&proto=6 HTTP/1.1\r\n"
- "Host: %s:%d\r\n"
+ "&proto=6 HTTP/1.0\r\n"
+ "Host: %s:%u\r\n"
"%s"
"Connection: close\r\n\r\n",
proxy_enabled ? "http://" : "",
@@ -1126,7 +1131,7 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
}else if ( strncmp(cddb_out,"DYEAR=",6)==0 ) // Year
{
valid = Try_To_Validate_Utf8_String(cddb_out+6); // '6' to skip 'DYEAR='
- if (g_utf8_strlen(valid, -1))
+ if (!et_str_empty (valid))
cddbalbum->year = valid;
g_free (cddb_out);
@@ -1135,7 +1140,7 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
}else if ( strncmp(cddb_out,"DGENRE=",7)==0 ) // Genre
{
valid = Try_To_Validate_Utf8_String(cddb_out+7); // '7' to skip 'DGENRE='
- if (g_utf8_strlen(valid, -1))
+ if (!et_str_empty (valid))
cddbalbum->genre = valid;
g_free (cddb_out);
@@ -1510,8 +1515,10 @@ Cddb_Search_Album_List_From_String_Freedb (EtCDDBDialog *self)
/* Get words to search... */
string = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->search_string_entry)));
- if (!string || g_utf8_strlen(string, -1) <= 0)
+ if (et_str_empty (string))
+ {
return FALSE;
+ }
/* Format the string of words */
g_strstrip (string);
@@ -1563,7 +1570,7 @@ Cddb_Search_Album_List_From_String_Freedb (EtCDDBDialog *self)
"%s"
"&grouping=none"
" HTTP/1.1\r\n"
- "Host: %s:%d\r\n"
+ "Host: %s:%u\r\n"
"User-Agent: %s %s\r\n"
"%s"
"Connection: close\r\n"
@@ -1783,7 +1790,13 @@ Cddb_Search_Album_List_From_String_Freedb (EtCDDBDialog *self)
if (web_search_disabled)
msg = g_strdup_printf(_("Sorry, the web-based search is currently not available"));
else
- msg = g_strdup_printf(ngettext("Found one matching album","Found %d matching albums",g_list_length(priv->album_list)),g_list_length(priv->album_list));
+ {
+ msg = g_strdup_printf (ngettext ("Found one matching album",
+ "Found %u matching albums",
+ g_list_length (priv->album_list)),
+ g_list_length (priv->album_list));
+ }
+
gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
g_free(msg);
@@ -1838,8 +1851,10 @@ Cddb_Search_Album_List_From_String_Gnudb (EtCDDBDialog *self)
/* Get words to search... */
string = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->search_string_entry)));
- if (!string || g_utf8_strlen(string, -1) <= 0)
+ if (et_str_empty (string))
+ {
return FALSE;
+ }
/* Format the string of words */
g_strstrip (string);
@@ -1903,7 +1918,7 @@ Cddb_Search_Album_List_From_String_Gnudb (EtCDDBDialog *self)
"%s"
"?page=%d"
" HTTP/1.1\r\n"
- "Host: %s:%d\r\n"
+ "Host: %s:%u\r\n"
"User-Agent: %s %s\r\n"
"%s"
"Connection: close\r\n"
@@ -2208,8 +2223,7 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
priv = et_cddb_dialog_get_instance_private (self);
- // Save the current displayed data
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
/* FIXME: Hack! */
file_selection = et_application_window_browser_get_selection (ET_APPLICATION_WINDOW (MainWindow));
@@ -2224,8 +2238,6 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
selectedcount = gtk_tree_selection_count_selected_rows(selection);
/* Check if at least one line was selected. No line selected is equal to all lines selected. */
- CddbTrackList_Line_Selected = FALSE;
-
if (selectedcount > 0)
{
/* Loop through selected rows only */
@@ -2416,8 +2428,7 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
&& (cddbtrackalbum->cddbalbum->genre
|| cddbtrackalbum->cddbalbum->category))
{
- if (cddbtrackalbum->cddbalbum->genre
- && g_utf8_strlen (cddbtrackalbum->cddbalbum->genre, -1) > 0)
+ if (!et_str_empty (cddbtrackalbum->cddbalbum->genre))
{
et_file_tag_set_genre (FileTag,
Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->genre));
@@ -2437,8 +2448,8 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
gchar *filename_generated_utf8;
gchar *filename_new_utf8;
- // Allocation of a new FileName
- FileName = ET_File_Name_Item_New();
+ /* Allocation of a new FileName. */
+ FileName = et_file_name_new ();
/* Build the filename with the path. */
track_number = et_track_number_to_string (cddbtrackalbum->track_number);
@@ -2446,7 +2457,9 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
filename_generated_utf8 = g_strconcat (track_number, " - ",
cddbtrackalbum->track_name,
NULL);
- ET_File_Name_Convert_Character(filename_generated_utf8); // Replace invalid characters
+ et_filename_prepare (filename_generated_utf8,
+ g_settings_get_boolean (MainSettings,
+ "rename-replace-illegal-chars"));
filename_new_utf8 = ET_File_Name_Generate (etfile,
filename_generated_utf8);
@@ -2545,8 +2558,7 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
&& (cddbtrackalbum->cddbalbum->genre
|| cddbtrackalbum->cddbalbum->category) )
{
- if (cddbtrackalbum->cddbalbum->genre
- && g_utf8_strlen (cddbtrackalbum->cddbalbum->genre, -1) > 0)
+ if (!et_str_empty (cddbtrackalbum->cddbalbum->genre))
{
et_file_tag_set_genre (FileTag,
Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->genre));
@@ -2568,8 +2580,8 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
gchar *filename_generated_utf8;
gchar *filename_new_utf8;
- // Allocation of a new FileName
- FileName = ET_File_Name_Item_New();
+ /* Allocation of a new FileName. */
+ FileName = et_file_name_new ();
/* Build the filename with the path. */
track_number = et_track_number_to_string (cddbtrackalbum->track_number);
@@ -2577,7 +2589,9 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
filename_generated_utf8 = g_strconcat (track_number, " - ",
cddbtrackalbum->track_name,
NULL);
- ET_File_Name_Convert_Character(filename_generated_utf8); // Replace invalid characters
+ et_filename_prepare (filename_generated_utf8,
+ g_settings_get_boolean (MainSettings,
+ "rename-replace-illegal-chars"));
filename_new_utf8 = ET_File_Name_Generate(etfile,filename_generated_utf8);
ET_Set_Filename_File_Name_Item(FileName,filename_new_utf8,NULL);
@@ -2612,7 +2626,8 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
(GDestroyNotify)gtk_tree_path_free);
et_application_window_browser_refresh_list (ET_APPLICATION_WINDOW (MainWindow));
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (ET_APPLICATION_WINDOW (MainWindow),
+ ETCore->ETFileDisplayed);
return TRUE;
}
@@ -3146,8 +3161,7 @@ Cddb_Read_Http_Header (FILE **file, gchar **cddb_out)
{
g_free (*cddb_out);
}
- while (Cddb_Read_Line (file, cddb_out) > 0
- && *cddb_out && strlen (*cddb_out) > 0);
+ while (Cddb_Read_Line (file, cddb_out) > 0 && !et_str_empty (*cddb_out));
//g_print("Http Header : %s\n",*cddb_out);
return 1;
@@ -3330,7 +3344,10 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
return FALSE;
}else
{
- msg = g_strdup_printf(ngettext("One file selected","%d files selected",file_selectedcount),file_selectedcount);
+ msg = g_strdup_printf (ngettext ("One file selected",
+ "%u files selected",
+ file_selectedcount),
+ file_selectedcount);
gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
g_free(msg);
}
@@ -3353,11 +3370,11 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
if (query_string->len > 0)
{
- g_string_append_printf (query_string, "+%d", total_frames);
+ g_string_append_printf (query_string, "+%u", total_frames);
}
else
{
- g_string_append_printf (query_string, "%d", total_frames);
+ g_string_append_printf (query_string, "%u", total_frames);
}
secs = etfile->ETFileInfo->duration;
@@ -3455,11 +3472,11 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
// proto=1 => ISO-8859-1 - proto=6 => UTF-8
cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+query+"
"%s+"
- "%d+%s+"
- "%d"
+ "%u+%s+"
+ "%u"
"&hello=noname+localhost+%s+%s"
"&proto=6 HTTP/1.1\r\n"
- "Host: %s:%d\r\n"
+ "Host: %s:%u\r\n"
"%s"
"Connection: close\r\n\r\n",
proxy_enabled ? "http://" : "",
@@ -3475,8 +3492,8 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
g_free (proxy_auth);
//g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
- msg = g_strdup_printf(_("Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"),
- cddb_discid,num_tracks,disc_length);
+ msg = g_strdup_printf (_("Sending request (disc ID: %s, #tracks: %u, Disc length: %u)…"),
+ cddb_discid, num_tracks, disc_length);
gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
g_free(msg);
@@ -3644,7 +3661,7 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
g_string_free (query_string, TRUE);
msg = g_strdup_printf (ngettext ("DiscID ‘%s’ gave one matching album",
- "DiscID ‘%s’ gave %d matching albums",
+ "DiscID ‘%s’ gave %u matching albums",
g_list_length (priv->album_list)),
cddb_discid, g_list_length (priv->album_list));
gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
diff --git a/src/core_types.h b/src/core_types.h
index 856b05f..c07693a 100644
--- a/src/core_types.h
+++ b/src/core_types.h
@@ -71,25 +71,6 @@ typedef enum
} ET_Tag_Type;
/*
- * Structure containing informations of the header of file
- * Nota: This struct was copied from an "MP3 structure", and will change later.
- */
-typedef struct
-{
- gint version; /* Version of bitstream (mpeg version for mp3, encoder version for ogg) */
- gint mpeg25; /* Version is MPEG 2.5? */
- gsize layer; /* "MP3 data" */
- gint bitrate; /* Bitrate (kb/s) */
- gboolean variable_bitrate; /* Is a VBR file? */
- gint samplerate; /* Samplerate (Hz) */
- gint mode; /* Stereo, ... or channels for ogg */
- goffset size; /* The size of file (in bytes) */
- gint duration; /* The duration of file (in seconds) */
- gchar *mpc_profile; /* MPC data */
- gchar *mpc_version; /* MPC data : encoder version (also for Speex) */
-} ET_File_Info;
-
-/*
* EtFileHeaderFields:
* @description: a description of the file type, such as MP3 File
* @version_label: the label for the encoder version, such as MPEG
diff --git a/src/easytag.c b/src/easytag.c
index 4d7b620..d7b0d33 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -166,8 +166,7 @@ Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
/* Save the current position in the list */
etfile_save_position = ETCore->ETFileDisplayed;
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (window);
/* Save widget that has current focus, to give it again the focus after saving */
widget_focused = gtk_window_get_focus(GTK_WINDOW(MainWindow));
@@ -348,7 +347,8 @@ Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE);
/* Return to the saved position in the list */
- ET_Display_File_Data_To_UI(etfile_save_position);
+ et_application_window_display_et_file (ET_APPLICATION_WINDOW (MainWindow),
+ etfile_save_position);
et_application_window_browser_select_file_by_et_file (ET_APPLICATION_WINDOW (MainWindow),
etfile_save_position,
TRUE);
@@ -997,7 +997,7 @@ Read_Directory (const gchar *path_real)
nbrfile = g_list_length(FileList);
et_application_window_progress_set_fraction (window, 0.0);
- g_snprintf(progress_bar_text, 30, "%d/%d", 0, nbrfile);
+ g_snprintf (progress_bar_text, 30, "%d/%u", 0, nbrfile);
et_application_window_progress_set_text (window, progress_bar_text);
// Load the supported files (Extension recognized)
@@ -1020,7 +1020,8 @@ Read_Directory (const gchar *path_real)
/* Update the progress bar. */
fraction = (++progress_bar_index) / (double) nbrfile;
et_application_window_progress_set_fraction (window, fraction);
- g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nbrfile);
+ g_snprintf (progress_bar_text, 30, "%d/%u", progress_bar_index,
+ nbrfile);
et_application_window_progress_set_text (window, progress_bar_text);
while (gtk_events_pending())
gtk_main_iteration();
@@ -1057,14 +1058,14 @@ Read_Directory (const gchar *path_real)
if (g_settings_get_boolean (MainSettings, "browse-subdir"))
{
msg = g_strdup_printf (ngettext ("Found one file in this directory and subdirectories",
- "Found %d files in this directory and subdirectories",
+ "Found %u files in this directory and subdirectories",
ETCore->ETFileDisplayedList_Length),
ETCore->ETFileDisplayedList_Length);
}
else
{
msg = g_strdup_printf (ngettext ("Found one file in this directory",
- "Found %d files in this directory",
+ "Found %u files in this directory",
ETCore->ETFileDisplayedList_Length),
ETCore->ETFileDisplayedList_Length);
}
diff --git a/src/easytag.h b/src/easytag.h
index 19c78f3..eddf211 100644
--- a/src/easytag.h
+++ b/src/easytag.h
@@ -27,12 +27,6 @@
#include "et_core.h"
-#define MAX_STRING_LEN 1024
-
-/***************
- * Declaration *
- ***************/
-
/* Variable to force to quit recursive functions (reading dirs) or stop saving files */
extern gboolean Main_Stop_Button_Pressed;
diff --git a/src/et_core.c b/src/et_core.c
index 6e11fb2..ef363b8 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -19,7 +19,6 @@
#include "et_core.h"
-#include "application_window.h"
#include "file.h"
#include "file_list.h"
diff --git a/src/et_core.h b/src/et_core.h
index 1fb6bfe..9775d5a 100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -46,7 +46,6 @@ typedef struct
// Displayed list (part of the main list of files displayed in BrowserList) (used when displaying by Artist & Album)
GList *ETFileDisplayedList; // List of files displayed (List of ET_File from ETFileList / ATArtistAlbumFileList) | !! May not point to the first item!!
- GList *ETFileDisplayedListPtr; // Pointer to the current item of ETFileDisplayedList used with ET_Displayed_File_List_First, ET_Displayed_File_List_Previous
guint ETFileDisplayedList_Length; // Contains the length of the displayed list
gfloat ETFileDisplayedList_TotalSize; // Total of the size of files in displayed list (in bytes)
gulong ETFileDisplayedList_TotalDuration; // Total of duration of files in displayed list (in seconds)
diff --git a/src/file.c b/src/file.c
index 7f41258..01c0d34 100644
--- a/src/file.c
+++ b/src/file.c
@@ -20,7 +20,6 @@
#include "file.h"
-#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <string.h>
#include <stdlib.h>
@@ -32,33 +31,25 @@
#include "easytag.h"
#include "file_tag.h"
#include "file_list.h"
-#include "mpeg_header.h"
-#include "monkeyaudio_header.h"
-#include "musepack_header.h"
#ifdef ENABLE_MP3
# include "id3_tag.h"
#endif
#include "picture.h"
#include "ape_tag.h"
#ifdef ENABLE_OGG
-# include "ogg_header.h"
-# include "ogg_tag.h"
+#include "ogg_tag.h"
#endif
#ifdef ENABLE_FLAC
-# include "flac_header.h"
-# include "flac_tag.h"
+#include "flac_tag.h"
#endif
#ifdef ENABLE_MP4
-# include "mp4_header.h"
-# include "mp4_tag.h"
+#include "mp4_tag.h"
#endif
#ifdef ENABLE_WAVPACK
-# include "wavpack_header.h"
-# include "wavpack_tag.h"
+#include "wavpack_tag.h"
#endif
#ifdef ENABLE_OPUS
#include "opus_tag.h"
-#include "opus_header.h"
#endif
#include "browser.h"
#include "log.h"
@@ -70,53 +61,13 @@
static gboolean ET_Free_File_Name_List (GList *FileNameList);
static gboolean ET_Free_File_Tag_List (GList *FileTagList);
-static void ET_Free_File_Name_Item (File_Name *FileName);
-static gboolean ET_Free_File_Info_Item (ET_File_Info *ETFileInfo);
-
-static void ET_Initialize_File_Name_Item (File_Name *FileName);
-
-static void ET_Display_Filename_To_UI (const ET_File *ETFile);
-static EtFileHeaderFields * ET_Display_File_Info_To_UI (const ET_File *ETFile);
-
-static gboolean ET_Save_File_Name_From_UI (const ET_File *ETFile,
- File_Name *FileName);
static void ET_Mark_File_Tag_As_Saved (ET_File *ETFile);
-static gboolean ET_Detect_Changes_Of_File_Name (const File_Name *FileName1,
- const File_Name *FileName2);
static gboolean ET_Add_File_Name_To_List (ET_File *ETFile,
File_Name *FileName);
static gboolean ET_Add_File_Tag_To_List (ET_File *ETFile, File_Tag *FileTag);
-static gchar *ET_File_Name_Format_Extension (const ET_File *ETFile);
-
-/*
- * Create a new File_Name structure
- */
-File_Name *ET_File_Name_Item_New (void)
-{
- File_Name *FileName;
-
- FileName = g_slice_new (File_Name);
- ET_Initialize_File_Name_Item (FileName);
-
- return FileName;
-}
-
-/*
- * Create a new File_Info structure
- */
-ET_File_Info *
-ET_File_Info_Item_New (void)
-{
- ET_File_Info *ETFileInfo;
-
- ETFileInfo = g_slice_new0 (ET_File_Info);
-
- return ETFileInfo;
-}
-
/*
* Create a new ET_File structure
*/
@@ -130,28 +81,6 @@ ET_File_Item_New (void)
return ETFile;
}
-
-static void
-ET_Initialize_File_Name_Item (File_Name *FileName)
-{
- if (FileName)
- {
- FileName->key = ET_Undo_Key_New();
- FileName->saved = FALSE;
- FileName->value = NULL;
- FileName->value_utf8 = NULL;
- FileName->value_ck = NULL;
- }
-}
-
-/* Key for Undo */
-guint
-ET_Undo_Key_New (void)
-{
- static guint ETUndoKey = 0;
- return ++ETUndoKey;
-}
-
/*
* Comparison function for sorting by ascending filename.
*/
@@ -1054,7 +983,7 @@ ET_Free_File_List_Item (ET_File *ETFile)
/* Frees infos of ETFileInfo */
if (ETFile->ETFileInfo)
{
- ET_Free_File_Info_Item (ETFile->ETFileInfo);
+ et_file_info_free (ETFile->ETFileInfo);
}
g_free(ETFile->ETFileExtension);
@@ -1073,27 +1002,11 @@ ET_Free_File_Name_List (GList *FileNameList)
FileNameList = g_list_first (FileNameList);
- g_list_free_full (FileNameList, (GDestroyNotify)ET_Free_File_Name_Item);
+ g_list_free_full (FileNameList, (GDestroyNotify)et_file_name_free);
return TRUE;
}
-
-/*
- * Frees a File_Name item.
- */
-static void
-ET_Free_File_Name_Item (File_Name *FileName)
-{
- g_return_if_fail (FileName != NULL);
-
- g_free(FileName->value);
- g_free(FileName->value_utf8);
- g_free(FileName->value_ck);
- g_slice_free (File_Name, FileName);
-}
-
-
/*
* Frees the full list: GList *TagList.
*/
@@ -1120,445 +1033,15 @@ ET_Free_File_Tag_List (GList *FileTagList)
}
-/*
- * Frees a File_Info item.
- */
-static gboolean
-ET_Free_File_Info_Item (ET_File_Info *ETFileInfo)
-{
- g_return_val_if_fail (ETFileInfo != NULL, FALSE);
-
- g_free(ETFileInfo->mpc_profile);
- g_free(ETFileInfo->mpc_version);
-
- g_slice_free (ET_File_Info, ETFileInfo);
- return TRUE;
-}
-
-
/*********************
* Copying functions *
*********************/
-/*
- * Fill content of a FileName item according to the filename passed in argument (UTF-8 filename or not)
- * Calculate also the collate key.
- * It treats numbers intelligently so that "file1" "file10" "file5" is sorted as "file1" "file5" "file10"
- */
-gboolean
-ET_Set_Filename_File_Name_Item (File_Name *FileName,
- const gchar *filename_utf8,
- const gchar *filename)
-{
- g_return_val_if_fail (FileName != NULL, FALSE);
-
- if (filename_utf8 && filename)
- {
- FileName->value_utf8 = g_strdup(filename_utf8);
- FileName->value = g_strdup(filename);
- FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
- }else if (filename_utf8)
- {
- FileName->value_utf8 = g_strdup(filename_utf8);
- FileName->value = filename_from_display(filename_utf8);
- FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
- }else if (filename)
- {
- FileName->value_utf8 = filename_to_display(filename);;
- FileName->value = g_strdup(filename);
- FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
- }else
- {
- return FALSE;
- }
-
- return TRUE;
-}
-
-/************************
- * Displaying functions *
- ************************/
-
-static void
-et_file_header_fields_free (EtFileHeaderFields *fields)
-{
- g_free (fields->version);
- g_free (fields->bitrate);
- g_free (fields->samplerate);
- g_free (fields->mode);
- g_free (fields->size);
- g_free (fields->duration);
- g_slice_free (EtFileHeaderFields, fields);
-}
-
-/*
- * Display information of the file (Position + Header + Tag) to the user interface.
- * Before doing it, it saves data of the file currently displayed
- */
-void
-ET_Display_File_Data_To_UI (ET_File *ETFile)
-{
- EtApplicationWindow *window;
- const ET_File_Description *description;
- const gchar *cur_filename_utf8;
- gchar *msg;
- EtFileHeaderFields *fields;
-
- g_return_if_fail (ETFile != NULL &&
- ((GList *)ETFile->FileNameCur)->data != NULL);
- /* For the case where ETFile is an "empty" structure. */
-
- cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
- description = ETFile->ETFileDescription;
-
- /* Save the current displayed file */
- ETCore->ETFileDisplayed = ETFile;
-
- window = ET_APPLICATION_WINDOW (MainWindow);
-
- /* Display position in list + show/hide icon if file writable/read_only (cur_filename) */
- et_application_window_file_area_set_file_fields (window, ETFile);
-
- /* Display filename (and his path) (value in FileNameNew) */
- ET_Display_Filename_To_UI(ETFile);
-
- /* Display tag data */
- et_application_window_tag_area_display_et_file (window, ETFile);
-
- /* Display controls in tag area */
- et_application_window_tag_area_display_controls (window, ETFile);
-
- /* Display file data, header data and file type */
- switch (description->FileType)
- {
-#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
- case MP3_FILE:
- case MP2_FILE:
- fields = et_mpeg_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_mpeg_file_header_fields_free (fields);
- break;
-#endif
-#ifdef ENABLE_OGG
- case OGG_FILE:
- fields = et_ogg_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_ogg_file_header_fields_free (fields);
- break;
-#endif
-#ifdef ENABLE_SPEEX
- case SPEEX_FILE:
- fields = et_ogg_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_ogg_file_header_fields_free (fields);
- break;
-#endif
-#ifdef ENABLE_FLAC
- case FLAC_FILE:
- fields = et_flac_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_flac_file_header_fields_free (fields);
- break;
-#endif
- case MPC_FILE:
- fields = et_mpc_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_mpc_file_header_fields_free (fields);
- break;
- case MAC_FILE:
- fields = et_mac_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_mac_file_header_fields_free (fields);
- break;
-#ifdef ENABLE_MP4
- case MP4_FILE:
- fields = et_mp4_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_mp4_file_header_fields_free (fields);
- break;
-#endif
-#ifdef ENABLE_WAVPACK
- case WAVPACK_FILE:
- fields = et_wavpack_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_wavpack_file_header_fields_free (fields);
- break;
-#endif
-#ifdef ENABLE_OPUS
- case OPUS_FILE:
- fields = et_opus_header_display_file_info_to_ui (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_opus_file_header_fields_free (fields);
- break;
-#endif
- case OFR_FILE:
- case UNKNOWN_FILE:
- default:
- /* Default displaying. */
- fields = ET_Display_File_Info_To_UI (ETFile);
- et_application_window_file_area_set_header_fields (window, fields);
- et_file_header_fields_free (fields);
- Log_Print (LOG_ERROR,
- "ETFileInfo: Undefined file type %d for file %s.",
- description->FileType, cur_filename_utf8);
- break;
- }
-
- msg = g_strdup_printf (_("File: ‘%s’"), cur_filename_utf8);
- et_application_window_status_bar_message (window, msg, FALSE);
- g_free (msg);
-}
-
-static void
-ET_Display_Filename_To_UI (const ET_File *ETFile)
-{
- const gchar *new_filename_utf8;
- gchar *dirname_utf8;
- gchar *text;
-
- g_return_if_fail (ETFile != NULL);
-
- new_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameNew)->data)->value_utf8;
-
- /*
- * Set the path to the file into BrowserEntry (dirbrowser)
- */
- dirname_utf8 = g_path_get_dirname(new_filename_utf8);
- et_application_window_browser_entry_set_text (ET_APPLICATION_WINDOW (MainWindow),
- dirname_utf8);
-
- // And refresh the number of files in this directory
- text = g_strdup_printf (ngettext ("One file", "%u files",
- et_file_list_get_n_files_in_path (ETCore->ETFileList,
- dirname_utf8)),
- et_file_list_get_n_files_in_path (ETCore->ETFileList,
- dirname_utf8));
- et_application_window_browser_label_set_text (ET_APPLICATION_WINDOW (MainWindow),
- text);
- g_free(dirname_utf8);
- g_free(text);
-}
-
-
-/*
- * "Default" way to display File Info to the user interface.
- */
-static EtFileHeaderFields *
-ET_Display_File_Info_To_UI (const ET_File *ETFile)
-{
- EtFileHeaderFields *fields;
- ET_File_Info *info;
- gchar *time = NULL;
- gchar *time1 = NULL;
- gchar *size = NULL;
- gchar *size1 = NULL;
-
- info = ETFile->ETFileInfo;
- fields = g_slice_new (EtFileHeaderFields);
-
- fields->description = _("File");
-
- /* MPEG, Layer versions */
- fields->version = g_strdup_printf ("%d, Layer %" G_GSIZE_FORMAT,
- info->version, info->layer);
-
- /* Bitrate */
- fields->bitrate = g_strdup_printf (_("%d kb/s"), info->bitrate);
-
- /* Samplerate */
- fields->samplerate = g_strdup_printf (_("%d Hz"), info->samplerate);
-
- /* Mode */
- fields->mode = g_strdup_printf ("%d", info->mode);
-
- /* Size */
- size = g_format_size (info->size);
- size1 = g_format_size (ETCore->ETFileDisplayedList_TotalSize);
- fields->size = g_strdup_printf ("%s (%s)", size, size1);
- g_free (size);
- g_free (size1);
-
- /* Duration */
- time = Convert_Duration (info->duration);
- time1 = Convert_Duration (ETCore->ETFileDisplayedList_TotalDuration);
- fields->duration = g_strdup_printf ("%s (%s)", time, time1);
- g_free (time);
- g_free (time1);
-
- return fields;
-}
-
/********************
* Saving functions *
********************/
/*
- * Save information of the file, contained into the entries of the user interface, in the list.
- * An undo key is generated to be used for filename and tag if there are changed is the same time.
- * Filename and Tag.
- */
-void ET_Save_File_Data_From_UI (ET_File *ETFile)
-{
- const ET_File_Description *description;
- File_Name *FileName;
- File_Tag *FileTag;
- guint undo_key;
- const gchar *cur_filename_utf8;
-
- g_return_if_fail (ETFile != NULL && ETFile->FileNameCur != NULL
- && ETFile->FileNameCur->data != NULL);
-
- cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
- description = ETFile->ETFileDescription;
- undo_key = ET_Undo_Key_New();
-
-
- /*
- * Save filename and generate undo for filename
- */
- FileName = g_slice_new (File_Name);
- ET_Initialize_File_Name_Item (FileName);
- FileName->key = undo_key;
- ET_Save_File_Name_From_UI(ETFile,FileName); // Used for all files!
-
- switch (description->TagType)
- {
-#ifdef ENABLE_MP3
- case ID3_TAG:
-#endif
-#ifdef ENABLE_OGG
- case OGG_TAG:
-#endif
-#ifdef ENABLE_FLAC
- case FLAC_TAG:
-#endif
-#ifdef ENABLE_MP4
- case MP4_TAG:
-#endif
-#ifdef ENABLE_WAVPACK
- case WAVPACK_TAG:
-#endif
-#ifdef ENABLE_OPUS
- case OPUS_TAG:
-#endif
- case APE_TAG:
- FileTag = et_application_window_tag_area_create_file_tag (ET_APPLICATION_WINDOW (MainWindow));
- et_file_tag_copy_other_into (ETFile->FileTag->data, FileTag);
- break;
- case UNKNOWN_TAG:
- default:
- FileTag = et_file_tag_new ();
- Log_Print (LOG_ERROR,
- "FileTag: Undefined tag type %d for file %s.",
- description->TagType, cur_filename_utf8);
- break;
- }
-
- /*
- * Generate undo for the file and the main undo list.
- * If no changes detected, FileName and FileTag item are deleted.
- */
- ET_Manage_Changes_Of_File_Data(ETFile,FileName,FileTag);
-
- /* Refresh file into browser list */
- et_application_window_browser_refresh_file_in_list (ET_APPLICATION_WINDOW (MainWindow),
- ETFile);
-}
-
-
-/*
- * Save displayed filename into list if it had been changed. Generates also an history list for undo/redo.
- * - ETFile : the current etfile that we want to save,
- * - FileName : where is 'temporary' saved the new filename.
- *
- * Note : it builds new filename (with path) from strings encoded into file system
- * encoding, not UTF-8 (it preserves file system encoding of parent directories).
- */
-static gboolean
-ET_Save_File_Name_From_UI (const ET_File *ETFile, File_Name *FileName)
-{
- gchar *filename_new = NULL;
- gchar *dirname = NULL;
- gchar *filename;
- const gchar *filename_utf8;
- gchar *extension;
-
- g_return_val_if_fail (ETFile != NULL && FileName != NULL, FALSE);
-
- filename_utf8 = et_application_window_file_area_get_filename (ET_APPLICATION_WINDOW (MainWindow));
- filename = filename_from_display (filename_utf8);
-
- if (!filename)
- {
- // If translation fails...
- GtkWidget *msgdialog;
- gchar *filename_escaped_utf8 = g_strescape(filename_utf8, NULL);
- msgdialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- _("Could not convert filename ‘%s’ to system filename encoding"),
- filename_escaped_utf8);
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msgdialog),_("Try setting the environment variable G_FILENAME_ENCODING."));
- gtk_window_set_title(GTK_WINDOW(msgdialog), _("Filename translation"));
-
- gtk_dialog_run(GTK_DIALOG(msgdialog));
- gtk_widget_destroy(msgdialog);
- g_free(filename_escaped_utf8);
- return FALSE;
- }
-
- // Get the current path to the file
- dirname = g_path_get_dirname( ((File_Name *)ETFile->FileNameNew->data)->value );
-
- // Convert filename extension (lower or upper)
- extension = ET_File_Name_Format_Extension(ETFile);
-
- // Check length of filename (limit ~255 characters)
- //ET_File_Name_Check_Length(ETFile,filename);
-
- // Filename (in file system encoding!)
- if (filename && strlen(filename)>0)
- {
- // Regenerate the new filename (without path)
- filename_new = g_strconcat(filename,extension,NULL);
- }else
- {
- // Keep the 'last' filename (if a 'blank' filename was entered in the fileentry for ex)...
- filename_new = g_path_get_basename( ((File_Name *)ETFile->FileNameNew->data)->value );
- }
- g_free (filename);
- g_free (extension);
-
- // Check if new filename seems to be correct
- if ( !filename_new || strlen(filename_new) <= strlen(ETFile->ETFileDescription->Extension) )
- {
- FileName->value = NULL;
- FileName->value_utf8 = NULL;
- FileName->value_ck = NULL;
-
- g_free(filename_new);
- g_free(dirname);
- return FALSE;
- }
-
- // Convert the illegal characters
- ET_File_Name_Convert_Character(filename_new); // FIX ME : should be in UTF8?
-
- /* Set the new filename (in file system encoding). */
- FileName->value = g_strconcat(dirname,G_DIR_SEPARATOR_S,filename_new,NULL);
- /* Set the new filename (in UTF-8 encoding). */
- FileName->value_utf8 = filename_to_display(FileName->value);
- // Calculates collate key
- FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-
- g_free(filename_new);
- g_free(dirname);
- return TRUE;
-}
-
-
-/*
* Do the same thing of ET_Save_File_Name_From_UI, but without getting the
* data from the UI.
*/
@@ -1571,6 +1054,7 @@ ET_Save_File_Name_Internal (const ET_File *ETFile,
gchar *filename;
gchar *extension;
gchar *pos;
+ gboolean success;
g_return_val_if_fail (ETFile != NULL && FileName != NULL, FALSE);
@@ -1584,8 +1068,8 @@ ET_Save_File_Name_Internal (const ET_File *ETFile,
if ((pos=strrchr(filename, '.'))!=NULL)
*pos = 0;
- // Convert filename extension (lower/upper)
- extension = ET_File_Name_Format_Extension(ETFile);
+ /* Convert filename extension (lower/upper). */
+ extension = ET_File_Format_File_Extension (ETFile);
// Check length of filename
//ET_File_Name_Check_Length(ETFile,filename);
@@ -1595,32 +1079,14 @@ ET_Save_File_Name_Internal (const ET_File *ETFile,
g_free(extension);
g_free(filename);
- // Check if new filename seems to be correct
- if (filename_new)
- {
- // Convert the illegal characters
- ET_File_Name_Convert_Character(filename_new);
-
- /* Set the new filename (in file system encoding). */
- FileName->value = g_strconcat(dirname,G_DIR_SEPARATOR_S,filename_new,NULL);
- /* Set the new filename (in UTF-8 encoding). */
- FileName->value_utf8 = filename_to_display(FileName->value);
- // Calculate collate key
- FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-
- g_free(filename_new);
- g_free(dirname);
- return TRUE;
- }else
- {
- FileName->value = NULL;
- FileName->value_utf8 = NULL;
- FileName->value_ck = NULL;
+ success = et_file_name_set_from_components (FileName, filename_new,
+ dirname,
+ g_settings_get_boolean (MainSettings,
+ "rename-replace-illegal-chars"));
- g_free(filename_new);
- g_free(dirname);
- return FALSE;
- }
+ g_free (filename_new);
+ g_free (dirname);
+ return success;
}
/*
@@ -1638,7 +1104,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
FileTagCur = (File_Tag *)ETFile->FileTag->data;
/* Title */
- if ( FileTagCur->title && g_utf8_strlen(FileTagCur->title, -1)>0 )
+ if (!et_str_empty (FileTagCur->title))
{
FileTag->title = g_strdup(FileTagCur->title);
g_strstrip (FileTag->title);
@@ -1648,7 +1114,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
}
/* Artist */
- if ( FileTagCur->artist && g_utf8_strlen(FileTagCur->artist, -1)>0 )
+ if (!et_str_empty (FileTagCur->artist))
{
FileTag->artist = g_strdup(FileTagCur->artist);
g_strstrip (FileTag->artist);
@@ -1657,8 +1123,8 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
FileTag->artist = NULL;
}
- /* Album Artist */
- if ( FileTagCur->album_artist && g_utf8_strlen(FileTagCur->album_artist, -1)>0 )
+ /* Album Artist */
+ if (!et_str_empty (FileTagCur->album_artist))
{
FileTag->album_artist = g_strdup(FileTagCur->album_artist);
g_strstrip (FileTag->album_artist);
@@ -1669,7 +1135,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Album */
- if ( FileTagCur->album && g_utf8_strlen(FileTagCur->album, -1)>0 )
+ if (!et_str_empty (FileTagCur->album))
{
FileTag->album = g_strdup(FileTagCur->album);
g_strstrip (FileTag->album);
@@ -1680,7 +1146,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Disc Number */
- if ( FileTagCur->disc_number && g_utf8_strlen(FileTagCur->disc_number, -1)>0 )
+ if (!et_str_empty (FileTagCur->disc_number))
{
FileTag->disc_number = g_strdup(FileTagCur->disc_number);
g_strstrip (FileTag->disc_number);
@@ -1691,8 +1157,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Discs Total */
- if (FileTagCur->disc_total
- && g_utf8_strlen (FileTagCur->disc_total, -1) > 0)
+ if (!et_str_empty (FileTagCur->disc_total))
{
FileTag->disc_total = et_disc_number_to_string (atoi (FileTagCur->disc_total));
g_strstrip (FileTag->disc_total);
@@ -1704,7 +1169,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Year */
- if ( FileTagCur->year && g_utf8_strlen(FileTagCur->year, -1)>0 )
+ if (!et_str_empty (FileTagCur->year))
{
FileTag->year = g_strdup(FileTagCur->year);
g_strstrip (FileTag->year);
@@ -1715,7 +1180,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Track */
- if ( FileTagCur->track && g_utf8_strlen(FileTagCur->track, -1)>0 )
+ if (!et_str_empty (FileTagCur->track))
{
gchar *tmp_str;
@@ -1733,7 +1198,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Track Total */
- if ( FileTagCur->track_total && g_utf8_strlen(FileTagCur->track_total, -1)>0 )
+ if (!et_str_empty (FileTagCur->track_total))
{
FileTag->track_total = et_track_number_to_string (atoi (FileTagCur->track_total));
g_strstrip (FileTag->track_total);
@@ -1744,7 +1209,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Genre */
- if ( FileTagCur->genre && g_utf8_strlen(FileTagCur->genre, -1)>0 )
+ if (!et_str_empty (FileTagCur->genre))
{
FileTag->genre = g_strdup(FileTagCur->genre);
g_strstrip (FileTag->genre);
@@ -1755,7 +1220,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Comment */
- if ( FileTagCur->comment && g_utf8_strlen(FileTagCur->comment, -1)>0 )
+ if (!et_str_empty (FileTagCur->comment))
{
FileTag->comment = g_strdup(FileTagCur->comment);
g_strstrip (FileTag->comment);
@@ -1766,7 +1231,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Composer */
- if ( FileTagCur->composer && g_utf8_strlen(FileTagCur->composer, -1)>0 )
+ if (!et_str_empty (FileTagCur->composer))
{
FileTag->composer = g_strdup(FileTagCur->composer);
g_strstrip (FileTag->composer);
@@ -1777,7 +1242,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Original Artist */
- if ( FileTagCur->orig_artist && g_utf8_strlen(FileTagCur->orig_artist, -1)>0 )
+ if (!et_str_empty (FileTagCur->orig_artist))
{
FileTag->orig_artist = g_strdup(FileTagCur->orig_artist);
g_strstrip (FileTag->orig_artist);
@@ -1788,7 +1253,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Copyright */
- if ( FileTagCur->copyright && g_utf8_strlen(FileTagCur->copyright, -1)>0 )
+ if (!et_str_empty (FileTagCur->copyright))
{
FileTag->copyright = g_strdup(FileTagCur->copyright);
g_strstrip (FileTag->copyright);
@@ -1799,7 +1264,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* URL */
- if ( FileTagCur->url && g_utf8_strlen(FileTagCur->url, -1)>0 )
+ if (!et_str_empty (FileTagCur->url))
{
FileTag->url = g_strdup(FileTagCur->url);
g_strstrip (FileTag->url);
@@ -1810,7 +1275,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
/* Encoded by */
- if ( FileTagCur->encoded_by && g_utf8_strlen(FileTagCur->encoded_by, -1)>0 )
+ if (!et_str_empty (FileTagCur->encoded_by))
{
FileTag->encoded_by = g_strdup(FileTagCur->encoded_by);
g_strstrip (FileTag->encoded_by);
@@ -1892,7 +1357,7 @@ ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error)
default:
Log_Print (LOG_ERROR,
"Saving to HD: Undefined function for tag type '%d' (file %s).",
- description->TagType, cur_filename_utf8);
+ (gint)description->TagType, cur_filename_utf8);
state = FALSE;
break;
}
@@ -1971,13 +1436,15 @@ ET_Manage_Changes_Of_File_Data (ET_File *ETFile,
*/
if (FileName)
{
- if ( ETFile->FileNameNew && ET_Detect_Changes_Of_File_Name( (File_Name *)(ETFile->FileNameNew)->data,FileName )==TRUE )
+ if (ETFile->FileNameNew
+ && et_file_name_detect_difference ((File_Name *)(ETFile->FileNameNew)->data,
+ FileName) == TRUE)
{
ET_Add_File_Name_To_List(ETFile,FileName);
undo_added |= TRUE;
}else
{
- ET_Free_File_Name_Item(FileName);
+ et_file_name_free (FileName);
}
}
@@ -2013,43 +1480,6 @@ ET_Manage_Changes_Of_File_Data (ET_File *ETFile,
}
/*
- * Compares two File_Name items :
- * - returns TRUE if there aren't the same
- * - else returns FALSE
- */
-static gboolean
-ET_Detect_Changes_Of_File_Name (const File_Name *FileName1,
- const File_Name *FileName2)
-{
- const gchar *filename1_ck;
- const gchar *filename2_ck;
-
- if (!FileName1 && !FileName2) return FALSE;
- if (FileName1 && !FileName2) return TRUE;
- if (!FileName1 && FileName2) return TRUE;
-
- /* Both FileName1 and FileName2 are != NULL. */
- if (!FileName1->value && !FileName2->value) return FALSE;
- if (FileName1->value && !FileName2->value) return TRUE;
- if (!FileName1->value && FileName2->value) return TRUE;
-
- /* Compare collate keys (with FileName->value converted to UTF-8 as it
- * contains raw data). */
- filename1_ck = FileName1->value_ck;
- filename2_ck = FileName2->value_ck;
-
- /* Filename changed ? (we check path + file). */
- if (strcmp (filename1_ck, filename2_ck) != 0)
- {
- return TRUE;
- }
- else
- {
- return FALSE;
- }
-}
-
-/*
* Add a FileName item to the history list of ETFile
*/
static gboolean
@@ -2322,8 +1752,8 @@ ET_File_Name_Generate (const ET_File *ETFile,
gchar *extension;
gchar *new_file_name_path_utf8;
- // Convert filename extension (lower/upper)
- extension = ET_File_Name_Format_Extension(ETFile);
+ /* Convert filename extension (lower/upper). */
+ extension = ET_File_Format_File_Extension (ETFile);
// Check length of filename (limit ~255 characters)
//ET_File_Name_Check_Length(ETFile,new_file_name_utf8);
@@ -2366,8 +1796,8 @@ gchar *ET_File_Name_Generate (ET_File *ETFile, gchar *new_file_name_utf8)
new_file_name = filename_from_display(new_file_name_utf8);
- // Convert filename extension (lower/upper)
- extension = ET_File_Name_Format_Extension(ETFile);
+ /* Convert filename extension (lower/upper). */
+ extension = ET_File_Format_File_Extension (ETFile);
// Check length of filename (limit ~255 characters)
//ET_File_Name_Check_Length(ETFile,new_file_name_utf8);
@@ -2399,8 +1829,8 @@ gchar *ET_File_Name_Generate (ET_File *ETFile, gchar *new_file_name_utf8)
/* Convert filename extension (lower/upper/no change). */
-static gchar *
-ET_File_Name_Format_Extension (const ET_File *ETFile)
+gchar *
+ET_File_Format_File_Extension (const ET_File *ETFile)
{
EtFilenameExtensionMode mode;
@@ -2418,54 +1848,3 @@ ET_File_Name_Format_Extension (const ET_File *ETFile)
return g_strdup (ETFile->ETFileExtension);
};
}
-
-
-/*
- * Used to replace the illegal characters in the filename
- * Paremeter 'filename' musn't contain the path, else directories separators would be replaced!
- */
-gboolean ET_File_Name_Convert_Character (gchar *filename_utf8)
-{
- gchar *character;
-
- g_return_val_if_fail (filename_utf8 != NULL, FALSE);
-
- // Convert automatically the directory separator ('/' on LINUX and '\' on WIN32) to '-'.
- while ( (character=g_utf8_strchr(filename_utf8, -1, G_DIR_SEPARATOR))!=NULL )
- *character = '-';
-
-#ifdef G_OS_WIN32
- /* Convert character '\' on WIN32 to '-'. */
- while ( (character=g_utf8_strchr(filename_utf8, -1, '\\'))!=NULL )
- *character = '-';
- /* Convert character '/' on WIN32 to '-'. May be converted to '\' after. */
- while ( (character=g_utf8_strchr(filename_utf8, -1, '/'))!=NULL )
- *character = '-';
-#endif /* G_OS_WIN32 */
-
- /* Convert other illegal characters on FAT32/16 filesystems and ISO9660 and
- * Joliet (CD-ROM filesystems). */
- if (g_settings_get_boolean (MainSettings, "rename-replace-illegal-chars"))
- {
- // Commented as we display unicode values as "\351" for "é"
- //while ( (character=g_utf8_strchr(filename_utf8, -1, '\\'))!=NULL )
- // *character = ',';
- while ( (character=g_utf8_strchr(filename_utf8, -1, ':'))!=NULL )
- *character = '-';
- //while ( (character=g_utf8_strchr(filename_utf8, -1, ';'))!=NULL )
- // *character = '-';
- while ( (character=g_utf8_strchr(filename_utf8, -1, '*'))!=NULL )
- *character = '+';
- while ( (character=g_utf8_strchr(filename_utf8, -1, '?'))!=NULL )
- *character = '_';
- while ( (character=g_utf8_strchr(filename_utf8, -1, '\"'))!=NULL )
- *character = '\'';
- while ( (character=g_utf8_strchr(filename_utf8, -1, '<'))!=NULL )
- *character = '(';
- while ( (character=g_utf8_strchr(filename_utf8, -1, '>'))!=NULL )
- *character = ')';
- while ( (character=g_utf8_strchr(filename_utf8, -1, '|'))!=NULL )
- *character = '-';
- }
- return TRUE;
-}
diff --git a/src/file.h b/src/file.h
index ef41d0b..ed43947 100644
--- a/src/file.h
+++ b/src/file.h
@@ -25,21 +25,11 @@ G_BEGIN_DECLS
#include "core_types.h"
#include "file_description.h"
+#include "file_info.h"
+#include "file_name.h"
#include "file_tag.h"
/*
- * Description of each item of the FileNameList list
- */
-typedef struct
-{
- guint key;
- gboolean saved; /* Set to TRUE if this filename had been saved */
- gchar *value; /* The filename containing the full path and the extension of the file */
- gchar *value_utf8; /* Same than "value", but converted to UTF-8 to avoid multiple call to the convertion function */
- gchar *value_ck; /* Collate key of "value_utf8" to speed up comparaison */
-} File_Name;
-
-/*
* Description of each item of the ETFileList list
*/
typedef struct
@@ -75,20 +65,13 @@ typedef struct
gboolean ET_Check_If_File_Is_Saved (const ET_File *ETFile);
ET_File * ET_File_Item_New (void);
-ET_File_Info * ET_File_Info_Item_New (void);
-File_Name * ET_File_Name_Item_New (void);
void ET_Free_File_List_Item (ET_File *ETFile);
-gboolean ET_Set_Filename_File_Name_Item (File_Name *FileName, const gchar *filename_utf8, const gchar *filename);
-
-void ET_Display_File_Data_To_UI (ET_File *ETFile);
void ET_Save_File_Data_From_UI (ET_File *ETFile);
gboolean ET_Save_File_Name_Internal (const ET_File *ETFile, File_Name *FileName);
gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error);
gboolean ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag);
-guint ET_Undo_Key_New (void);
-
gboolean ET_Undo_File_Data (ET_File *ETFile);
gboolean ET_Redo_File_Data (ET_File *ETFile);
gboolean ET_File_Data_Has_Undo_Data (const ET_File *ETFile);
@@ -96,8 +79,8 @@ gboolean ET_File_Data_Has_Redo_Data (const ET_File *ETFile);
gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, File_Tag *FileTag);
void ET_Mark_File_Name_As_Saved (ET_File *ETFile);
-gboolean ET_File_Name_Convert_Character (gchar *filename_utf8);
gchar *ET_File_Name_Generate (const ET_File *ETFile, const gchar *new_file_name);
+gchar * ET_File_Format_File_Extension (const ET_File *ETFile);
gint ET_Comp_Func_Sort_File_By_Ascending_Filename (const ET_File *ETFile1, const ET_File *ETFile2);
gint ET_Comp_Func_Sort_File_By_Descending_Filename (const ET_File *ETFile1, const ET_File *ETFile2);
diff --git a/src/file_area.c b/src/file_area.c
index 30eb8f9..be9849a 100644
--- a/src/file_area.c
+++ b/src/file_area.c
@@ -356,7 +356,7 @@ et_file_area_set_file_fields (EtFileArea *self,
g_free (basename_utf8);
/* Show position of current file in list */
- text = g_strdup_printf ("%d/%d:", ETFile->IndexKey,
+ text = g_strdup_printf ("%u/%u:", ETFile->IndexKey,
ETCore->ETFileDisplayedList_Length);
gtk_label_set_text (GTK_LABEL (priv->index_label), text);
g_object_unref (file);
diff --git a/src/dlm.h b/src/file_info.c
similarity index 62%
copy from src/dlm.h
copy to src/file_info.c
index 1c9e905..088256c 100644
--- a/src/dlm.h
+++ b/src/file_info.c
@@ -1,5 +1,5 @@
/* EasyTAG - tag editor for audio files
- * Copyright (C) 2004 Santtu Lakkala <inz at inz.fi>
+ * Copyright (C) 2015 David King <amigadave at amigadave.com>
*
* 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
@@ -16,15 +16,27 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef ET_DLM_H_
-#define ET_DLM_H_
+#include "file_info.h"
-#include <glib.h>
-
-G_BEGIN_DECLS
+/*
+ * Create a new File_Info structure
+ */
+ET_File_Info *
+et_file_info_new (void)
+{
+ return g_slice_new0 (ET_File_Info);
+}
-gint dlm (const gchar *s, const gchar *t);
+/*
+ * Frees a File_Info item.
+ */
+void
+et_file_info_free (ET_File_Info *file_info)
+{
+ g_return_if_fail (file_info != NULL);
-G_END_DECLS
+ g_free (file_info->mpc_profile);
+ g_free (file_info->mpc_version);
-#endif /* ET_DLM_H_ */
+ g_slice_free (ET_File_Info, file_info);
+}
diff --git a/src/file_info.h b/src/file_info.h
new file mode 100644
index 0000000..8e52322
--- /dev/null
+++ b/src/file_info.h
@@ -0,0 +1,50 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2015 David King <amigadave at amigadave.com>
+ *
+ * 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.
+ */
+
+#ifndef ET_FILE_INFO_H_
+#define ET_FILE_INFO_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/*
+ * Structure containing informations of the header of file
+ * Nota: This struct was copied from an "MP3 structure", and will change later.
+ */
+typedef struct
+{
+ gint version; /* Version of bitstream (mpeg version for mp3, encoder version for ogg) */
+ gint mpeg25; /* Version is MPEG 2.5? */
+ gsize layer; /* "MP3 data" */
+ gint bitrate; /* Bitrate (kb/s) */
+ gboolean variable_bitrate; /* Is a VBR file? */
+ gint samplerate; /* Samplerate (Hz) */
+ gint mode; /* Stereo, ... or channels for ogg */
+ goffset size; /* The size of file (in bytes) */
+ gint duration; /* The duration of file (in seconds) */
+ gchar *mpc_profile; /* MPC data */
+ gchar *mpc_version; /* MPC data : encoder version (also for Speex) */
+} ET_File_Info;
+
+ET_File_Info * et_file_info_new (void);
+void et_file_info_free (ET_File_Info *file_info);
+
+G_END_DECLS
+
+#endif /* !ET_FILE_INFO_H_ */
diff --git a/src/file_list.c b/src/file_list.c
index 4451857..9f4f6ac 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -32,6 +32,7 @@
#include "charset.h"
#include "easytag.h"
#include "log.h"
+#include "misc.h"
#include "mpeg_header.h"
#include "monkeyaudio_header.h"
#include "musepack_header.h"
@@ -89,7 +90,10 @@ et_history_file_list_free (GList *file_list)
{
g_return_if_fail (file_list != NULL);
- g_list_free_full (file_list, (GDestroyNotify)et_history_file_free);
+ /* et_history_list_add() sets the list to the final element, so explicitly
+ * go back to the start. */
+ g_list_free_full (g_list_first (file_list),
+ (GDestroyNotify)et_history_file_free);
}
/*
@@ -224,11 +228,9 @@ et_file_list_add (GList *file_list,
ETFileExtension = g_strdup(ET_Get_File_Extension(filename));
/* Fill the File_Name structure for FileNameList */
- FileName = ET_File_Name_Item_New();
+ FileName = et_file_name_new ();
FileName->saved = TRUE; /* The file hasn't been changed, so it's saved */
- FileName->value = filename;
- FileName->value_utf8 = filename_utf8;
- FileName->value_ck = g_utf8_collate_key_for_filename(filename_utf8, -1);
+ ET_Set_Filename_File_Name_Item (FileName, filename_utf8, filename);
/* Fill the File_Tag structure for FileTagList */
FileTag = et_file_tag_new ();
@@ -247,7 +249,7 @@ et_file_list_add (GList *file_list,
if (!id3tag_read_file_tag (file, FileTag, &error))
{
Log_Print (LOG_ERROR,
- "Error reading ID3 tag from file ‘%s’: %s",
+ _("Error reading ID3 tag from file ‘%s’: %s"),
filename_utf8, error->message);
g_clear_error (&error);
}
@@ -322,7 +324,7 @@ et_file_list_add (GList *file_list,
/* FIXME: Translatable string. */
Log_Print (LOG_ERROR,
"FileTag: Undefined tag type (%d) for file %s",
- description->TagType, filename_utf8);
+ (gint)description->TagType, filename_utf8);
break;
}
@@ -334,7 +336,7 @@ et_file_list_add (GList *file_list,
}
/* Fill the ET_File_Info structure */
- ETFileInfo = ET_File_Info_Item_New ();
+ ETFileInfo = et_file_info_new ();
switch (description->FileType)
{
@@ -388,7 +390,7 @@ et_file_list_add (GList *file_list,
/* FIXME: Translatable string. */
Log_Print (LOG_ERROR,
"ETFileInfo: Undefined file type (%d) for file %s",
- description->FileType, filename_utf8);
+ (gint)description->FileType, filename_utf8);
/* To get at least the file size. */
success = et_core_read_file_info (file, ETFileInfo, &error);
break;
@@ -444,9 +446,9 @@ et_file_list_add (GList *file_list,
* Process the filename and tag to generate undo if needed...
* The undo key must be the same for FileName and FileTag => changed in the same time
*/
- undo_key = ET_Undo_Key_New();
+ undo_key = et_undo_key_new ();
- FileName = ET_File_Name_Item_New();
+ FileName = et_file_name_new ();
FileName->key = undo_key;
ET_Save_File_Name_Internal(ETFile,FileName);
@@ -475,6 +477,9 @@ et_file_list_add (GList *file_list,
//ET_Add_File_To_Artist_Album_File_List(ETFile);
//ET_Debug_Print_File_List(ETCore->ETFileList,__FILE__,__LINE__,__FUNCTION__);
+
+ g_free (filename_utf8);
+
return result;
}
@@ -574,7 +579,7 @@ et_artist_album_list_add_file (GList *file_list,
GList *result;
ET_File *etfile = NULL;
- g_return_if_fail (ETFile != NULL);
+ g_return_val_if_fail (ETFile != NULL, NULL);
/* Album value of the ETFile passed in parameter. */
ETFile_Album = ((File_Tag *)ETFile->FileTag->data)->album;
@@ -1130,15 +1135,6 @@ ET_Displayed_File_List_By_Etfile (const ET_File *ETFile)
}
/*
- * Just returns the current item of the "main list"
- */
-/*GList *ET_Displayed_File_List_Current (void)
-{
- return ETCore->ETFileDisplayedList;
- //return ETCore->ETFileDisplayedListPtr;
-}*/
-
-/*
* Load the list of displayed files (calculate length, size, ...)
* It contains part (filtrated : view by artists and albums) or full ETCore->ETFileList list
*/
@@ -1222,15 +1218,9 @@ et_file_list_update_directory_name (GList *file_list,
(new_path[strlen (new_path) - 1] == G_DIR_SEPARATOR) ? "" : G_DIR_SEPARATOR_S,
&filename[strlen (old_path_tmp)],NULL);
- /* Replace the filename (in file system encoding). */
- g_free (FileName->value);
- FileName->value = filename_tmp;
- /* Replace the filename (in file system encoding). */
- g_free (FileName->value_utf8);
- FileName->value_utf8 = filename_to_display (FileName->value);
- /* Recalculate the collate key. */
- g_free (FileName->value_ck);
- FileName->value_ck = g_utf8_collate_key_for_filename (FileName->value_utf8, -1);
+ ET_Set_Filename_File_Name_Item (FileName, NULL,
+ filename_tmp);
+ g_free (filename_tmp);
}
}
}
diff --git a/src/file_name.c b/src/file_name.c
new file mode 100644
index 0000000..8b335d3
--- /dev/null
+++ b/src/file_name.c
@@ -0,0 +1,161 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2015 David King <amigadave at amigadave.com>
+ *
+ * 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.
+ */
+
+#include "file_name.h"
+
+#include "charset.h"
+#include "misc.h"
+
+#include <string.h>
+
+/*
+ * Create a new File_Name structure
+ */
+File_Name *
+et_file_name_new (void)
+{
+ File_Name *file_name;
+
+ file_name = g_slice_new (File_Name);
+ file_name->key = et_undo_key_new ();
+ file_name->saved = FALSE;
+ file_name->value = NULL;
+ file_name->value_utf8 = NULL;
+ file_name->value_ck = NULL;
+
+ return file_name;
+}
+
+/*
+ * Frees a File_Name item.
+ */
+void
+et_file_name_free (File_Name *file_name)
+{
+ g_return_if_fail (file_name != NULL);
+
+ g_free (file_name->value);
+ g_free (file_name->value_utf8);
+ g_free (file_name->value_ck);
+ g_slice_free (File_Name, file_name);
+}
+
+/*
+ * Fill content of a FileName item according to the filename passed in argument (UTF-8 filename or not)
+ * Calculate also the collate key.
+ * It treats numbers intelligently so that "file1" "file10" "file5" is sorted as "file1" "file5" "file10"
+ */
+void
+ET_Set_Filename_File_Name_Item (File_Name *FileName,
+ const gchar *filename_utf8,
+ const gchar *filename)
+{
+ g_return_if_fail (FileName != NULL);
+
+ if (filename_utf8 && filename)
+ {
+ FileName->value_utf8 = g_strdup (filename_utf8);
+ FileName->value = g_strdup (filename);
+ FileName->value_ck = g_utf8_collate_key_for_filename (FileName->value_utf8, -1);
+ }
+ else if (filename_utf8)
+ {
+ FileName->value_utf8 = g_strdup (filename_utf8);
+ FileName->value = filename_from_display (filename_utf8);
+ FileName->value_ck = g_utf8_collate_key_for_filename (FileName->value_utf8, -1);
+ }
+ else if (filename)
+ {
+ FileName->value_utf8 = filename_to_display (filename);;
+ FileName->value = g_strdup (filename);
+ FileName->value_ck = g_utf8_collate_key_for_filename (FileName->value_utf8, -1);
+ }
+}
+
+gboolean
+et_file_name_set_from_components (File_Name *file_name,
+ const gchar *new_name,
+ const gchar *dir_name,
+ gboolean replace_illegal)
+{
+ /* Check if new filename seems to be correct. */
+ if (new_name)
+ {
+ gchar *filename_new;
+ gchar *path_new;
+
+ filename_new = g_strdup (new_name);
+
+ /* Convert the illegal characters. */
+ et_filename_prepare (filename_new, replace_illegal);
+
+ /* Set the new filename (in file system encoding). */
+ path_new = g_build_filename (dir_name, filename_new, NULL);
+ ET_Set_Filename_File_Name_Item (file_name, NULL, path_new);
+
+ g_free (path_new);
+ g_free (filename_new);
+ return TRUE;
+ }
+ else
+ {
+ file_name->value = NULL;
+ file_name->value_utf8 = NULL;
+ file_name->value_ck = NULL;
+
+ return FALSE;
+ }
+}
+
+/*
+ * Compares two File_Name items :
+ * - returns TRUE if there aren't the same
+ * - else returns FALSE
+ */
+gboolean
+et_file_name_detect_difference (const File_Name *a,
+ const File_Name *b)
+{
+ const gchar *filename1_ck;
+ const gchar *filename2_ck;
+
+ g_return_val_if_fail (a && b, FALSE);
+
+ if (a && !b) return TRUE;
+ if (!a && b) return TRUE;
+
+ /* Both a and b are != NULL. */
+ if (!a->value && !b->value) return FALSE;
+ if (a->value && !b->value) return TRUE;
+ if (!a->value && b->value) return TRUE;
+
+ /* Compare collate keys (with FileName->value converted to UTF-8 as it
+ * contains raw data). */
+ filename1_ck = a->value_ck;
+ filename2_ck = b->value_ck;
+
+ /* Filename changed ? (we check path + file). */
+ if (strcmp (filename1_ck, filename2_ck) != 0)
+ {
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
diff --git a/src/file_name.h b/src/file_name.h
new file mode 100644
index 0000000..b65311a
--- /dev/null
+++ b/src/file_name.h
@@ -0,0 +1,46 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2015 David King <amigadave at amigadave.com>
+ *
+ * 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.
+ */
+
+#ifndef ET_FILE_NAME_H_
+#define ET_FILE_NAME_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/*
+ * Description of each item of the FileNameList list
+ */
+typedef struct
+{
+ guint key;
+ gboolean saved; /* Set to TRUE if this filename had been saved */
+ gchar *value; /* The filename containing the full path and the extension of the file */
+ gchar *value_utf8; /* Same than "value", but converted to UTF-8 to avoid multiple call to the convertion function */
+ gchar *value_ck; /* Collate key of "value_utf8" to speed up comparison. */
+} File_Name;
+
+File_Name * et_file_name_new (void);
+void et_file_name_free (File_Name *file_name);
+void ET_Set_Filename_File_Name_Item (File_Name *FileName, const gchar *filename_utf8, const gchar *filename);
+gboolean et_file_name_set_from_components (File_Name *file_name, const gchar *new_name, const gchar *dir_name, gboolean replace_illegal);
+gboolean et_file_name_detect_difference (const File_Name *a, const File_Name *b);
+
+G_END_DECLS
+
+#endif /* !ET_FILE_NAME_H_ */
diff --git a/src/file_tag.c b/src/file_tag.c
index 507b39f..a3595ca 100644
--- a/src/file_tag.c
+++ b/src/file_tag.c
@@ -18,7 +18,7 @@
#include "file_tag.h"
-#include "file.h"
+#include "misc.h"
/*
* Create a new File_Tag structure.
@@ -29,7 +29,7 @@ et_file_tag_new (void)
File_Tag *file_tag;
file_tag = g_slice_new0 (File_Tag);
- file_tag->key = ET_Undo_Key_New ();
+ file_tag->key = et_undo_key_new ();
return file_tag;
}
@@ -41,6 +41,7 @@ static void
et_file_tag_free_other_field (File_Tag *file_tag)
{
g_list_free_full (file_tag->other, g_free);
+ file_tag->other = NULL;
}
@@ -75,7 +76,7 @@ et_file_tag_free (File_Tag *FileTag)
}
/*
- * Duplicate the 'other' list
+ * Duplicate the 'other' list, preserving the list already in @destination.
*/
void
et_file_tag_copy_other_into (File_Tag *destination,
@@ -105,7 +106,7 @@ et_file_tag_copy_into (File_Tag *destination,
g_return_if_fail (destination != NULL);
/* Key for the item, may be overwritten. */
- destination->key = ET_Undo_Key_New ();
+ destination->key = et_undo_key_new ();
et_file_tag_set_title (destination, source->title);
et_file_tag_set_artist (destination, source->artist);
@@ -349,98 +350,106 @@ et_file_tag_detect_difference (const File_Tag *FileTag1,
return TRUE;
/* Title */
- if ( FileTag1->title && !FileTag2->title && g_utf8_strlen(FileTag1->title, -1)>0 ) return TRUE;
- if (!FileTag1->title && FileTag2->title && g_utf8_strlen(FileTag2->title, -1)>0 ) return TRUE;
- if ( FileTag1->title && FileTag2->title && g_utf8_collate(FileTag1->title,FileTag2->title)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->title, FileTag2->title) != 0)
+ {
+ return TRUE;
+ }
/* Artist */
- if ( FileTag1->artist && !FileTag2->artist && g_utf8_strlen(FileTag1->artist, -1)>0 ) return TRUE;
- if (!FileTag1->artist && FileTag2->artist && g_utf8_strlen(FileTag2->artist, -1)>0 ) return TRUE;
- if ( FileTag1->artist && FileTag2->artist && g_utf8_collate(FileTag1->artist,FileTag2->artist)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->artist, FileTag2->artist) != 0)
+ {
+ return TRUE;
+ }
/* Album Artist */
- if ( FileTag1->album_artist && !FileTag2->album_artist && g_utf8_strlen(FileTag1->album_artist, -1)>0 ) return TRUE;
- if (!FileTag1->album_artist && FileTag2->album_artist && g_utf8_strlen(FileTag2->album_artist, -1)>0 ) return TRUE;
- if ( FileTag1->album_artist && FileTag2->album_artist && g_utf8_collate(FileTag1->album_artist,FileTag2->album_artist)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->album_artist,
+ FileTag2->album_artist) != 0)
+ {
+ return TRUE;
+ }
/* Album */
- if ( FileTag1->album && !FileTag2->album && g_utf8_strlen(FileTag1->album, -1)>0 ) return TRUE;
- if (!FileTag1->album && FileTag2->album && g_utf8_strlen(FileTag2->album, -1)>0 ) return TRUE;
- if ( FileTag1->album && FileTag2->album && g_utf8_collate(FileTag1->album,FileTag2->album)!=0 ) return TRUE;
-
- /* Disc Number */
- if ( FileTag1->disc_number && !FileTag2->disc_number && g_utf8_strlen(FileTag1->disc_number, -1)>0 ) return TRUE;
- if (!FileTag1->disc_number && FileTag2->disc_number && g_utf8_strlen(FileTag2->disc_number, -1)>0 ) return TRUE;
- if ( FileTag1->disc_number && FileTag2->disc_number && g_utf8_collate(FileTag1->disc_number,FileTag2->disc_number)!=0 ) return TRUE;
-
- /* Discs Total */
- if (FileTag1->disc_total && !FileTag2->disc_total
- && g_utf8_strlen (FileTag1->disc_total, -1) > 0)
+ if (et_normalized_strcmp0 (FileTag1->album, FileTag2->album) != 0)
{
return TRUE;
}
- if (!FileTag1->disc_total && FileTag2->disc_total
- && g_utf8_strlen (FileTag2->disc_total, -1) > 0)
+ /* Disc Number */
+ if (et_normalized_strcmp0 (FileTag1->disc_number,
+ FileTag2->disc_number) != 0)
{
return TRUE;
}
- if (FileTag1->disc_total && FileTag2->disc_total
- && g_utf8_collate (FileTag1->disc_total, FileTag2->disc_total) != 0)
+ /* Discs Total */
+ if (et_normalized_strcmp0 (FileTag1->disc_total,
+ FileTag2->disc_total) != 0)
{
return TRUE;
}
/* Year */
- if ( FileTag1->year && !FileTag2->year && g_utf8_strlen(FileTag1->year, -1)>0 ) return TRUE;
- if (!FileTag1->year && FileTag2->year && g_utf8_strlen(FileTag2->year, -1)>0 ) return TRUE;
- if ( FileTag1->year && FileTag2->year && g_utf8_collate(FileTag1->year,FileTag2->year)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->year, FileTag2->year) != 0)
+ {
+ return TRUE;
+ }
/* Track */
- if ( FileTag1->track && !FileTag2->track && g_utf8_strlen(FileTag1->track, -1)>0 ) return TRUE;
- if (!FileTag1->track && FileTag2->track && g_utf8_strlen(FileTag2->track, -1)>0 ) return TRUE;
- if ( FileTag1->track && FileTag2->track && g_utf8_collate(FileTag1->track,FileTag2->track)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->track, FileTag2->track) != 0)
+ {
+ return TRUE;
+ }
/* Track Total */
- if ( FileTag1->track_total && !FileTag2->track_total && g_utf8_strlen(FileTag1->track_total, -1)>0 ) return TRUE;
- if (!FileTag1->track_total && FileTag2->track_total && g_utf8_strlen(FileTag2->track_total, -1)>0 ) return TRUE;
- if ( FileTag1->track_total && FileTag2->track_total && g_utf8_collate(FileTag1->track_total,FileTag2->track_total)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->track_total,
+ FileTag2->track_total) != 0)
+ {
+ return TRUE;
+ }
/* Genre */
- if ( FileTag1->genre && !FileTag2->genre && g_utf8_strlen(FileTag1->genre, -1)>0 ) return TRUE;
- if (!FileTag1->genre && FileTag2->genre && g_utf8_strlen(FileTag2->genre, -1)>0 ) return TRUE;
- if ( FileTag1->genre && FileTag2->genre && g_utf8_collate(FileTag1->genre,FileTag2->genre)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->genre, FileTag2->genre) != 0)
+ {
+ return TRUE;
+ }
/* Comment */
- if ( FileTag1->comment && !FileTag2->comment && g_utf8_strlen(FileTag1->comment, -1)>0 ) return TRUE;
- if (!FileTag1->comment && FileTag2->comment && g_utf8_strlen(FileTag2->comment, -1)>0 ) return TRUE;
- if ( FileTag1->comment && FileTag2->comment && g_utf8_collate(FileTag1->comment,FileTag2->comment)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->comment, FileTag2->comment) != 0)
+ {
+ return TRUE;
+ }
/* Composer */
- if ( FileTag1->composer && !FileTag2->composer && g_utf8_strlen(FileTag1->composer, -1)>0 ) return TRUE;
- if (!FileTag1->composer && FileTag2->composer && g_utf8_strlen(FileTag2->composer, -1)>0 ) return TRUE;
- if ( FileTag1->composer && FileTag2->composer && g_utf8_collate(FileTag1->composer,FileTag2->composer)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->composer, FileTag2->composer) != 0)
+ {
+ return TRUE;
+ }
/* Original artist */
- if ( FileTag1->orig_artist && !FileTag2->orig_artist && g_utf8_strlen(FileTag1->orig_artist, -1)>0 ) return TRUE;
- if (!FileTag1->orig_artist && FileTag2->orig_artist && g_utf8_strlen(FileTag2->orig_artist, -1)>0 ) return TRUE;
- if ( FileTag1->orig_artist && FileTag2->orig_artist && g_utf8_collate(FileTag1->orig_artist,FileTag2->orig_artist)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->orig_artist,
+ FileTag2->orig_artist) != 0)
+ {
+ return TRUE;
+ }
/* Copyright */
- if ( FileTag1->copyright && !FileTag2->copyright && g_utf8_strlen(FileTag1->copyright, -1)>0 ) return TRUE;
- if (!FileTag1->copyright && FileTag2->copyright && g_utf8_strlen(FileTag2->copyright, -1)>0 ) return TRUE;
- if ( FileTag1->copyright && FileTag2->copyright && g_utf8_collate(FileTag1->copyright,FileTag2->copyright)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->copyright, FileTag2->copyright) != 0)
+ {
+ return TRUE;
+ }
/* URL */
- if ( FileTag1->url && !FileTag2->url && g_utf8_strlen(FileTag1->url, -1)>0 ) return TRUE;
- if (!FileTag1->url && FileTag2->url && g_utf8_strlen(FileTag2->url, -1)>0 ) return TRUE;
- if ( FileTag1->url && FileTag2->url && g_utf8_collate(FileTag1->url,FileTag2->url)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->url, FileTag2->url) != 0)
+ {
+ return TRUE;
+ }
/* Encoded by */
- if ( FileTag1->encoded_by && !FileTag2->encoded_by && g_utf8_strlen(FileTag1->encoded_by, -1)>0 ) return TRUE;
- if (!FileTag1->encoded_by && FileTag2->encoded_by && g_utf8_strlen(FileTag2->encoded_by, -1)>0 ) return TRUE;
- if ( FileTag1->encoded_by && FileTag2->encoded_by && g_utf8_collate(FileTag1->encoded_by,FileTag2->encoded_by)!=0 ) return TRUE;
+ if (et_normalized_strcmp0 (FileTag1->encoded_by,
+ FileTag2->encoded_by) != 0)
+ {
+ return TRUE;
+ }
/* Picture */
for (pic1 = FileTag1->picture, pic2 = FileTag2->picture; ;
@@ -459,15 +468,10 @@ et_file_tag_detect_difference (const File_Tag *FileTag1,
}
if (pic1->type != pic2->type)
return TRUE;
- if (pic1->description && !pic2->description
- && g_utf8_strlen(pic1->description, -1)>0 )
- return TRUE;
- if (!pic1->description && pic2->description
- && g_utf8_strlen(pic2->description, -1)>0 )
- return TRUE;
- if (pic1->description && pic2->description
- && g_utf8_collate(pic1->description, pic2->description)!=0 )
+ if (et_normalized_strcmp0 (pic1->description, pic2->description) != 0)
+ {
return TRUE;
+ }
}
return FALSE; /* No changes */
diff --git a/src/load_files_dialog.c b/src/load_files_dialog.c
index 1d562a1..ef3ebc2 100644
--- a/src/load_files_dialog.c
+++ b/src/load_files_dialog.c
@@ -91,8 +91,7 @@ Load_Filename_Set_Filenames (EtLoadFilesDialog *self)
if ( !ETCore->ETFileList || !priv->load_file_content_view || !priv->load_file_name_view)
return;
- /* Save current file */
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
rowcount = MIN(gtk_tree_model_iter_n_children(GTK_TREE_MODEL(priv->load_file_name_model), NULL),
gtk_tree_model_iter_n_children(GTK_TREE_MODEL(priv->load_file_content_model), NULL));
@@ -114,13 +113,15 @@ Load_Filename_Set_Filenames (EtLoadFilesDialog *self)
gtk_tree_model_get(GTK_TREE_MODEL(priv->load_file_content_model), &iter_content,
LOAD_FILE_CONTENT_TEXT, &list_text, -1);
- if (ETFile && list_text && (g_utf8_strlen (list_text, -1) > 0))
+ if (ETFile && !et_str_empty (list_text))
{
gchar *list_text_tmp;
gchar *filename_new_utf8;
list_text_tmp = g_strdup(list_text);
- ET_File_Name_Convert_Character(list_text_tmp); // Replace invalid characters
+ et_filename_prepare (list_text_tmp,
+ g_settings_get_boolean (MainSettings,
+ "rename-replace-illegal-chars"));
/* Build the filename with the path */
filename_new_utf8 = ET_File_Name_Generate(ETFile,list_text_tmp);
@@ -128,7 +129,7 @@ Load_Filename_Set_Filenames (EtLoadFilesDialog *self)
/* Set the new filename */
// Create a new 'File_Name' item
- FileName = ET_File_Name_Item_New();
+ FileName = et_file_name_new ();
// Save changes of the 'File_Name' item
ET_Set_Filename_File_Name_Item(FileName,filename_new_utf8,NULL);
ET_Manage_Changes_Of_File_Data(ETFile,FileName,NULL);
@@ -155,7 +156,8 @@ Load_Filename_Set_Filenames (EtLoadFilesDialog *self)
gtk_tree_path_free(currentPath);
et_application_window_browser_refresh_list (ET_APPLICATION_WINDOW (MainWindow));
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (ET_APPLICATION_WINDOW (MainWindow),
+ ETCore->ETFileDisplayed);
}
/*
@@ -396,7 +398,7 @@ Load_Filename_List_Delete_All_Blank_Lines (GtkWidget *treeview)
gtk_tree_model_get(model, &iter, LOAD_FILE_NAME_TEXT, &text, -1);
/* Check for blank entry */
- if (!text || g_utf8_strlen(text, -1) == 0)
+ if (et_str_empty (text))
{
g_free(text);
@@ -1075,12 +1077,6 @@ create_load_files_dialog (EtLoadFilesDialog *self)
}
static void
-et_load_files_dialog_finalize (GObject *object)
-{
- G_OBJECT_CLASS (et_load_files_dialog_parent_class)->finalize (object);
-}
-
-static void
et_load_files_dialog_init (EtLoadFilesDialog *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ET_TYPE_LOAD_FILES_DIALOG,
@@ -1092,8 +1088,6 @@ et_load_files_dialog_init (EtLoadFilesDialog *self)
static void
et_load_files_dialog_class_init (EtLoadFilesDialogClass *klass)
{
- G_OBJECT_CLASS (klass)->finalize = et_load_files_dialog_finalize;
-
g_type_class_add_private (klass, sizeof (EtLoadFilesDialogPrivate));
}
diff --git a/src/misc.c b/src/misc.c
index cc5d519..139680e 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -34,11 +34,6 @@
#endif /* G_OS_WIN32 */
-/***************
- * Declaration *
- ***************/
-static const guint BOX_SPACING = 6;
-
/*
* Add the 'string' passed in parameter to the list store
* If this string already exists in the list store, it doesn't add it.
@@ -52,7 +47,7 @@ gboolean Add_String_To_Combo_List (GtkListStore *liststore, const gchar *str)
//gboolean found = FALSE;
gchar *string = g_strdup(str);
- if (!string || g_utf8_strlen(string, -1) <= 0)
+ if (et_str_empty (string))
{
g_free (string);
return FALSE;
@@ -324,16 +319,22 @@ gchar *Convert_Duration (gulong duration)
gchar *data = NULL;
if (duration == 0)
- return g_strdup_printf("%d:%.2d",minute,second);
+ {
+ return g_strdup_printf ("%u:%.2u", minute, second);
+ }
hour = duration/3600;
minute = (duration%3600)/60;
second = (duration%3600)%60;
if (hour)
- data = g_strdup_printf("%d:%.2d:%.2d",hour,minute,second);
+ {
+ data = g_strdup_printf ("%u:%.2u:%.2u", hour, minute, second);
+ }
else
- data = g_strdup_printf("%d:%.2d",minute,second);
+ {
+ data = g_strdup_printf ("%u:%.2u", minute, second);
+ }
return data;
}
@@ -343,13 +344,13 @@ et_disc_number_to_string (const guint disc_number)
{
if (g_settings_get_boolean (MainSettings, "tag-disc-padded"))
{
- return g_strdup_printf ("%.*d",
- g_settings_get_uint (MainSettings,
- "tag-disc-length"),
+ return g_strdup_printf ("%.*u",
+ (gint)g_settings_get_uint (MainSettings,
+ "tag-disc-length"),
disc_number);
}
- return g_strdup_printf ("%d", disc_number);
+ return g_strdup_printf ("%u", disc_number);
}
gchar *
@@ -357,12 +358,130 @@ et_track_number_to_string (const guint track_number)
{
if (g_settings_get_boolean (MainSettings, "tag-number-padded"))
{
- return g_strdup_printf ("%.*d", g_settings_get_uint (MainSettings,
- "tag-number-length"),
+ return g_strdup_printf ("%.*u",
+ (gint)g_settings_get_uint (MainSettings,
+ "tag-number-length"),
track_number);
}
else
{
- return g_strdup_printf ("%d", track_number);
+ return g_strdup_printf ("%u", track_number);
}
}
+
+/*
+ * et_filename_prepare:
+ * @filename_utf8: UTF8-encoded basename
+ * @replace_illegal: whether to replace illegal characters in the file name
+ *
+ * Used to replace (in place) the illegal characters in the filename.
+ */
+void
+et_filename_prepare (gchar *filename_utf8,
+ gboolean replace_illegal)
+{
+ gchar *character;
+
+ g_return_if_fail (filename_utf8 != NULL);
+
+ // Convert automatically the directory separator ('/' on LINUX and '\' on WIN32) to '-'.
+ while ( (character=g_utf8_strchr(filename_utf8, -1, G_DIR_SEPARATOR))!=NULL )
+ *character = '-';
+
+#ifdef G_OS_WIN32
+ /* Convert character '\' on WIN32 to '-'. */
+ while ( (character=g_utf8_strchr(filename_utf8, -1, '\\'))!=NULL )
+ *character = '-';
+ /* Convert character '/' on WIN32 to '-'. May be converted to '\' after. */
+ while ( (character=g_utf8_strchr(filename_utf8, -1, '/'))!=NULL )
+ *character = '-';
+#endif /* G_OS_WIN32 */
+
+ /* Convert other illegal characters on FAT32/16 filesystems and ISO9660 and
+ * Joliet (CD-ROM filesystems). */
+ if (replace_illegal)
+ {
+ // Commented as we display unicode values as "\351" for "é"
+ //while ( (character=g_utf8_strchr(filename_utf8, -1, '\\'))!=NULL )
+ // *character = ',';
+ while ( (character=g_utf8_strchr(filename_utf8, -1, ':'))!=NULL )
+ *character = '-';
+ //while ( (character=g_utf8_strchr(filename_utf8, -1, ';'))!=NULL )
+ // *character = '-';
+ while ( (character=g_utf8_strchr(filename_utf8, -1, '*'))!=NULL )
+ *character = '+';
+ while ( (character=g_utf8_strchr(filename_utf8, -1, '?'))!=NULL )
+ *character = '_';
+ while ( (character=g_utf8_strchr(filename_utf8, -1, '\"'))!=NULL )
+ *character = '\'';
+ while ( (character=g_utf8_strchr(filename_utf8, -1, '<'))!=NULL )
+ *character = '(';
+ while ( (character=g_utf8_strchr(filename_utf8, -1, '>'))!=NULL )
+ *character = ')';
+ while ( (character=g_utf8_strchr(filename_utf8, -1, '|'))!=NULL )
+ *character = '-';
+ }
+}
+
+/* Key for Undo */
+guint
+et_undo_key_new (void)
+{
+ static guint ETUndoKey = 0;
+ return ++ETUndoKey;
+}
+
+/*
+ * et_normalized_strcmp0:
+ * @str1: UTF-8 string, or %NULL
+ * @str2: UTF-8 string to compare against, or %NULL
+ *
+ * Compare two UTF-8 strings, normalizing them before doing so, and return the
+ * difference.
+ *
+ * Returns: an integer less than, equal to, or greater than zero, if str1 is <,
+ * == or > than str2
+ */
+gint
+et_normalized_strcmp0 (const gchar *str1,
+ const gchar *str2)
+{
+ gint result;
+ gchar *normalized1;
+ gchar *normalized2;
+
+ /* Check for NULL, as it cannot be passed to g_utf8_normalize(). */
+ if (!str1)
+ {
+ return -(str1 != str2);
+ }
+
+ if (!str2)
+ {
+ return str1 != str2;
+ }
+
+ normalized1 = g_utf8_normalize (str1, -1, G_NORMALIZE_DEFAULT);
+ normalized2 = g_utf8_normalize (str2, -1, G_NORMALIZE_DEFAULT);
+
+ result = g_strcmp0 (normalized1, normalized2);
+
+ g_free (normalized1);
+ g_free (normalized2);
+
+ return result;
+}
+
+/*
+ * et_str_empty:
+ * @str: string to test for emptiness
+ *
+ * Test if @str is empty, in other words either %NULL or the empty string.
+ *
+ * Returns: %TRUE is @str is either %NULL or "", %FALSE otherwise
+ */
+gboolean
+et_str_empty (const gchar *str)
+{
+ return !str || !str[0];
+}
diff --git a/src/misc.h b/src/misc.h
index ae3a14f..72a25f7 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -37,6 +37,12 @@ gboolean et_run_program (const gchar *program_name, GList *args_list, GError **e
gchar * et_disc_number_to_string (const guint disc_number);
gchar * et_track_number_to_string (const guint track_number);
+void et_filename_prepare (gchar *filename_utf8, gboolean replace_illegal);
+
+guint et_undo_key_new (void);
+gint et_normalized_strcmp0 (const gchar *str1, const gchar *str2);
+gboolean et_str_empty (const gchar *str);
+
G_END_DECLS
#endif /* ET_MISC_H_ */
diff --git a/src/playlist_dialog.c b/src/playlist_dialog.c
index 946786a..f28bf1e 100644
--- a/src/playlist_dialog.c
+++ b/src/playlist_dialog.c
@@ -225,6 +225,8 @@ write_playlist (EtPlaylistDialog *self, GFile *file, GError **error)
g_string_free (to_write, TRUE);
g_free (mask);
g_free (filename_generated_utf8);
+
+ break;
}
default:
g_assert_not_reached ();
@@ -427,7 +429,7 @@ write_button_clicked (EtPlaylistDialog *self)
/* Check if playlist name was filled. */
if (g_settings_get_boolean (MainSettings, "playlist-use-mask")
- && g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY(priv->name_mask_entry)), -1) <=0)
+ && *(gtk_entry_get_text (GTK_ENTRY (priv->name_mask_entry))) == '\0')
{
/* TODO: Can this happen? */
g_settings_set_boolean (MainSettings, "playlist-use-mask", FALSE);
@@ -602,7 +604,8 @@ entry_check_content_mask (GtkEntry *entry, gpointer user_data)
g_return_if_fail (entry != NULL);
mask = g_strdup (gtk_entry_get_text (entry));
- if (!mask || strlen(mask)<1)
+
+ if (et_str_empty (mask))
goto Bad_Mask;
while (mask)
@@ -773,12 +776,6 @@ create_playlist_dialog (EtPlaylistDialog *self)
}
static void
-et_playlist_dialog_finalize (GObject *object)
-{
- G_OBJECT_CLASS (et_playlist_dialog_parent_class)->finalize (object);
-}
-
-static void
et_playlist_dialog_init (EtPlaylistDialog *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ET_TYPE_PLAYLIST_DIALOG,
@@ -790,8 +787,6 @@ et_playlist_dialog_init (EtPlaylistDialog *self)
static void
et_playlist_dialog_class_init (EtPlaylistDialogClass *klass)
{
- G_OBJECT_CLASS (klass)->finalize = et_playlist_dialog_finalize;
-
g_type_class_add_private (klass, sizeof (EtPlaylistDialogPrivate));
}
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index 112cba9..32138fb 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -1199,12 +1199,6 @@ et_preferences_on_response (GtkDialog *dialog, gint response_id,
}
static void
-et_preferences_dialog_finalize (GObject *object)
-{
- G_OBJECT_CLASS (et_preferences_dialog_parent_class)->finalize (object);
-}
-
-static void
et_preferences_dialog_init (EtPreferencesDialog *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ET_TYPE_PREFERENCES_DIALOG,
@@ -1216,8 +1210,6 @@ et_preferences_dialog_init (EtPreferencesDialog *self)
static void
et_preferences_dialog_class_init (EtPreferencesDialogClass *klass)
{
- G_OBJECT_CLASS (klass)->finalize = et_preferences_dialog_finalize;
-
g_type_class_add_private (klass, sizeof (EtPreferencesDialogPrivate));
}
diff --git a/src/scan_dialog.c b/src/scan_dialog.c
index 263270f..e4e54fd 100644
--- a/src/scan_dialog.c
+++ b/src/scan_dialog.c
@@ -88,8 +88,6 @@ struct _EtScanDialogPrivate
GtkWidget *rename_file_preview_label;
};
-static const guint BOX_SPACING = 6;
-
/* Some predefined masks -- IMPORTANT: Null-terminate me! */
static const gchar *Scan_Masks [] =
{
@@ -369,7 +367,7 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
/* Set the default text to comment. */
if (g_settings_get_boolean (MainSettings, "fill-set-default-comment")
&& (g_settings_get_boolean (MainSettings, "fill-overwrite-tag-fields")
- || FileTag->comment == NULL || strlen (FileTag->comment) == 0))
+ || et_str_empty (FileTag->comment)))
{
gchar *default_comment = g_settings_get_string (MainSettings,
"fill-default-comment");
@@ -380,7 +378,7 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
/* Set CRC-32 value as default comment (for files with ID3 tag only). */
if (g_settings_get_boolean (MainSettings, "fill-crc32-comment")
&& (g_settings_get_boolean (MainSettings, "fill-overwrite-tag-fields")
- || FileTag->comment == NULL || strlen (FileTag->comment) == 0))
+ || et_str_empty (FileTag->comment)))
{
GFile *file;
GError *error = NULL;
@@ -519,7 +517,7 @@ Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
gchar *file_seq_utf8 = filename_to_display(file_seq);
//g_print(">%d> seq '%s' '%s'\n",loop,mask_seq,file_seq);
- while ( mask_seq && strlen(mask_seq)>0 )
+ while (!et_str_empty (mask_seq))
{
/*
@@ -566,7 +564,7 @@ Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
/*
* Determine separator between two code or trailing text (after code)
*/
- if ( mask_seq && strlen(mask_seq)>0 )
+ if (!et_str_empty (mask_seq))
{
if ( (tmp=strchr(mask_seq,'%')) == NULL || strlen(tmp) < 2 )
{
@@ -795,11 +793,9 @@ Scan_Rename_File_With_Mask (EtScanDialog *self, ET_File *ETFile)
FALSE);
g_free(mask);
- if (!filename_generated_utf8)
- return;
- if (g_utf8_strlen(filename_generated_utf8,-1)<1)
+ if (!et_str_empty (filename_generated_utf8))
{
- g_free(filename_generated_utf8);
+ g_free (filename_generated_utf8);
return;
}
@@ -828,8 +824,8 @@ Scan_Rename_File_With_Mask (EtScanDialog *self, ET_File *ETFile)
g_free(filename_generated_utf8);
/* Set the new filename */
- // Create a new 'File_Name' item
- FileName = ET_File_Name_Item_New();
+ /* Create a new 'File_Name' item. */
+ FileName = et_file_name_new ();
// Save changes of the 'File_Name' item
ET_Set_Filename_File_Name_Item(FileName,filename_new_utf8,NULL);
@@ -919,7 +915,8 @@ et_scan_generate_new_filename_from_mask (const ET_File *ETFile,
// Now, parses the code to get the corresponding string (from tag)
source = Scan_Return_File_Tag_Field_From_Mask_Code((File_Tag *)ETFile->FileTag->data,tmp[1]);
mask_item = g_slice_new0 (File_Mask_Item);
- if (source && *source && strlen(*source)>0)
+
+ if (source && !et_str_empty (*source))
{
mask_item->type = FIELD;
mask_item->string = g_strdup(*source);
@@ -930,7 +927,9 @@ et_scan_generate_new_filename_from_mask (const ET_File *ETFile,
{
EtConvertSpaces convert_mode;
- ET_File_Name_Convert_Character (mask_item->string);
+ et_filename_prepare (mask_item->string,
+ g_settings_get_boolean (MainSettings,
+ "rename-replace-illegal-chars"));
convert_mode = g_settings_get_enum (MainSettings,
"rename-convert-spaces");
@@ -963,7 +962,7 @@ et_scan_generate_new_filename_from_mask (const ET_File *ETFile,
}
// It may have some characters before the last remaining code ('__%a')
- if (mask!=NULL && strlen(mask)>0)
+ if (!et_str_empty (mask))
{
mask_item = g_slice_new0 (File_Mask_Item);
mask_item->type = LEADING_SEPARATOR;
@@ -1072,7 +1071,8 @@ et_scan_generate_new_filename_from_mask (const ET_File *ETFile,
if (path_utf8_cur)
{
filename_tmp = filename_new_utf8; // in UTF-8!
- filename_new_utf8 = g_strconcat(path_utf8_cur,G_DIR_SEPARATOR_S,filename_new_utf8,NULL);
+ filename_new_utf8 = g_build_filename (path_utf8_cur, filename_new_utf8,
+ NULL);
g_free(filename_tmp);
g_free(path_utf8_cur);
}
@@ -1334,7 +1334,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
filename_utf8 = st_filename->value_utf8;
if (!FileName)
- FileName = ET_File_Name_Item_New();
+ FileName = et_file_name_new ();
string = g_path_get_basename(filename_utf8);
// Remove the extension to set it to lower case (to avoid problem with undo)
@@ -1734,7 +1734,7 @@ Mask_Editor_Clean_Up_Masks_List (EtScanDialog *self)
gtk_tree_model_get(treemodel, ¤tIter, MASK_EDITOR_TEXT, &text, -1);
/* Check for blank entry */
- if (text && g_utf8_strlen(text, -1) == 0)
+ if (text && *text == '\0')
{
g_free(text);
@@ -2765,7 +2765,8 @@ entry_check_scan_tag_mask (GtkEntry *entry, gpointer user_data)
g_return_if_fail (entry != NULL);
mask = g_strdup (gtk_entry_get_text (entry));
- if (!mask || strlen(mask)<1)
+
+ if (et_str_empty (mask))
goto Bad_Mask;
while (mask)
@@ -2841,7 +2842,8 @@ entry_check_rename_file_mask (GtkEntry *entry, gpointer user_data)
g_return_if_fail (entry != NULL);
mask = g_strdup (gtk_entry_get_text (entry));
- if (!mask || strlen(mask)<1)
+
+ if (et_str_empty (mask))
goto Bad_Mask;
// Not a valid path....
@@ -2901,11 +2903,10 @@ et_scan_dialog_scan_selected_files (EtScanDialog *self)
g_return_if_fail (ETCore->ETFileDisplayedList != NULL);
- /* Save the current displayed data */
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ window = ET_APPLICATION_WINDOW (MainWindow);
+ et_application_window_update_et_file_from_ui (window);
/* Initialize status bar */
- window = ET_APPLICATION_WINDOW (MainWindow);
selection = et_application_window_browser_get_selection (window);
selectcount = gtk_tree_selection_count_selected_rows (selection);
et_application_window_progress_set_fraction (window, 0.0);
@@ -2944,7 +2945,7 @@ et_scan_dialog_scan_selected_files (EtScanDialog *self)
et_application_window_browser_refresh_list (window);
/* Display the current file */
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (window, ETCore->ETFileDisplayed);
/* To update state of command buttons */
et_application_window_update_actions (window);
diff --git a/src/search_dialog.c b/src/search_dialog.c
index 1170afe..069cb87 100644
--- a/src/search_dialog.c
+++ b/src/search_dialog.c
@@ -696,12 +696,6 @@ et_search_dialog_apply_changes (EtSearchDialog *self)
}
static void
-et_search_dialog_finalize (GObject *object)
-{
- G_OBJECT_CLASS (et_search_dialog_parent_class)->finalize (object);
-}
-
-static void
et_search_dialog_init (EtSearchDialog *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ET_TYPE_SEARCH_DIALOG,
@@ -713,8 +707,6 @@ et_search_dialog_init (EtSearchDialog *self)
static void
et_search_dialog_class_init (EtSearchDialogClass *klass)
{
- G_OBJECT_CLASS (klass)->finalize = et_search_dialog_finalize;
-
g_type_class_add_private (klass, sizeof (EtSearchDialogPrivate));
}
diff --git a/src/setting.c b/src/setting.c
index e5d6e70..cad24ff 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -298,7 +298,7 @@ Populate_List_Store_From_File (const gchar *filename,
utf8_line = Try_To_Validate_Utf8_String (line);
g_free (line);
- if (utf8_line && g_utf8_strlen (utf8_line, -1) > 0)
+ if (!et_str_empty (utf8_line))
{
gtk_list_store_insert_with_values (liststore, NULL, G_MAXINT,
text_column, utf8_line, -1);
diff --git a/src/tag_area.c b/src/tag_area.c
index 5fa6526..8ec2c99 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -137,8 +137,8 @@ on_apply_to_selection (GObject *object,
GList *etfilelist = NULL;
GList *selection_filelist = NULL;
GList *l;
- gchar *string_to_set = NULL;
- gchar *string_to_set1 = NULL;
+ const gchar *string_to_set;
+ const gchar *string_to_set1;
gchar *msg = NULL;
ET_File *etfile;
File_Tag *FileTag;
@@ -150,8 +150,7 @@ on_apply_to_selection (GObject *object,
window = ET_APPLICATION_WINDOW (MainWindow);
- // Save the current displayed data
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+ et_application_window_update_et_file_from_ui (window);
/* Warning : 'selection_filelist' is not a list of 'ETFile' items! */
selection = et_application_window_browser_get_selection (window);
@@ -171,7 +170,7 @@ on_apply_to_selection (GObject *object,
if (object == G_OBJECT (priv->title_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->title_entry),0,-1); // The string to apply to all other files
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->title_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -181,7 +180,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_title (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with title ‘%s’"),
string_to_set);
@@ -193,7 +193,7 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->artist_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->artist_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->artist_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -203,7 +203,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_artist (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with artist ‘%s’"),
string_to_set);
@@ -215,7 +216,8 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->album_artist_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->album_artist_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->album_artist_entry));
+
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
etfile = (ET_File *)l->data;
@@ -224,7 +226,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_album_artist (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with album artist ‘%s’"),
string_to_set);
@@ -236,7 +239,7 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->album_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->album_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->album_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -246,7 +249,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_album (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with album ‘%s’"),
string_to_set);
@@ -258,21 +262,21 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->disc_number_entry))
{
- const gchar *entry_text;
gchar *separator;
+ gchar *disc_number = NULL;
- entry_text = gtk_entry_get_text (GTK_ENTRY (priv->disc_number_entry));
- separator = g_utf8_strchr (entry_text, -1, '/');
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->disc_number_entry));
+ /* g_utf8_strchr() does not allocate a new string, and should probably
+ * return a const gchar *. */
+ separator = g_utf8_strchr (string_to_set, -1, '/');
if (separator)
{
- string_to_set1 = g_strdup (separator + 1);
- string_to_set = g_strndup (entry_text,
- separator - entry_text);
+ string_to_set1 = separator + 1;
+ disc_number = g_strndup (string_to_set, separator - string_to_set);
}
else
{
- string_to_set = g_strdup (entry_text);
string_to_set1 = NULL;
}
@@ -281,18 +285,20 @@ on_apply_to_selection (GObject *object,
etfile = (ET_File *)l->data;
FileTag = et_file_tag_new ();
et_file_tag_copy_into (FileTag, etfile->FileTag->data);
- et_file_tag_set_disc_number (FileTag, string_to_set);
+ et_file_tag_set_disc_number (FileTag, disc_number ? disc_number
+ : string_to_set);
et_file_tag_set_disc_total (FileTag, string_to_set1);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen (string_to_set, -1) > 0)
+ if (!et_str_empty (string_to_set))
{
- if (string_to_set1 != NULL
- && g_utf8_strlen (string_to_set1, -1) > 0)
+ if (!et_str_empty (string_to_set1))
{
msg = g_strdup_printf (_("Selected files tagged with disc number ‘%s/%s’"),
- string_to_set, string_to_set1);
+ disc_number ? disc_number
+ : string_to_set,
+ string_to_set1);
}
else
{
@@ -303,10 +309,12 @@ on_apply_to_selection (GObject *object,
{
msg = g_strdup (_("Removed disc number from selected files"));
}
+
+ g_free (disc_number);
}
else if (object == G_OBJECT (priv->year_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->year_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->year_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -316,7 +324,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_year (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with year ‘%s’"),
string_to_set);
@@ -329,8 +338,8 @@ on_apply_to_selection (GObject *object,
else if (object == G_OBJECT (priv->track_total_entry))
{
/* Used of Track and Total Track values */
- string_to_set = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->track_combo_entry)))));
- string_to_set1 = gtk_editable_get_chars(GTK_EDITABLE(priv->track_total_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->track_combo_entry))));
+ string_to_set1 = gtk_entry_get_text (GTK_ENTRY (priv->track_total_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -340,7 +349,7 @@ on_apply_to_selection (GObject *object,
// We apply the TrackEntry field to all others files only if it is to delete
// the field (string=""). Else we don't overwrite the track number
- if (!string_to_set || g_utf8_strlen(string_to_set, -1) == 0)
+ if (et_str_empty (string_to_set))
{
et_file_tag_set_track_number (FileTag, string_to_set);
}
@@ -349,9 +358,9 @@ on_apply_to_selection (GObject *object,
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if ( string_to_set && g_utf8_strlen(string_to_set, -1) > 0 ) //&& atoi(string_to_set)>0 )
+ if (!et_str_empty (string_to_set))
{
- if ( string_to_set1 != NULL && g_utf8_strlen(string_to_set1, -1)>0 ) //&& atoi(string_to_set1)>0 )
+ if (!et_str_empty (string_to_set1))
{
msg = g_strdup_printf (_("Selected files tagged with track like ‘xx/%s’"),
string_to_set1);
@@ -386,6 +395,7 @@ on_apply_to_selection (GObject *object,
while (etfilelist && etfilelistfull)
{
+ gchar *track_string;
// To get the path of the file
const File_Name *FileNameCur = (File_Name *)((ET_File *)etfilelistfull->data)->FileNameCur->data;
// The ETFile in the selected file list
@@ -397,21 +407,21 @@ on_apply_to_selection (GObject *object,
if ( path && path1 && strcmp(path,path1)!=0 )
i = 0;
- string_to_set = et_track_number_to_string (++i);
+ track_string = et_track_number_to_string (++i);
// The file is in the selection?
if ( (ET_File *)etfilelistfull->data == etfile )
{
FileTag = et_file_tag_new ();
et_file_tag_copy_into (FileTag, etfile->FileTag->data);
- et_file_tag_set_track_number (FileTag, string_to_set);
+ et_file_tag_set_track_number (FileTag, track_string);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
if (!etfilelist->next) break;
etfilelist = g_list_next(etfilelist);
}
- g_free(string_to_set);
+ g_free (track_string);
g_free(path);
path = g_strdup(path1);
@@ -424,40 +434,52 @@ on_apply_to_selection (GObject *object,
}
else if (object==G_OBJECT(priv->track_number_button))
{
+ gchar *track_total = NULL;
+
/* Used of Track and Total Track values */
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
- gchar *path_utf8, *filename_utf8;
+ const gchar *filename_utf8;
+ gchar *path_utf8;
+ gchar *track_string;
etfile = (ET_File *)l->data;
filename_utf8 = ((File_Name *)etfile->FileNameNew->data)->value_utf8;
path_utf8 = g_path_get_dirname(filename_utf8);
- string_to_set = et_track_number_to_string (et_file_list_get_n_files_in_path (ETCore->ETFileList, path_utf8));
+ track_string = et_track_number_to_string (et_file_list_get_n_files_in_path (ETCore->ETFileList, path_utf8));
- g_free(path_utf8);
- if (!string_to_set1)
- string_to_set1 = g_strdup(string_to_set); // Just for the message below...
+ g_free (path_utf8);
+
+ if (!track_total)
+ {
+ /* Just for the message below, and only the first directory. */
+ track_total = g_strdup (track_string);
+ }
FileTag = et_file_tag_new ();
et_file_tag_copy_into (FileTag, etfile->FileTag->data);
- et_file_tag_set_track_total (FileTag, string_to_set);
+ et_file_tag_set_track_total (FileTag, track_string);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+
+ g_free (track_string);
}
- if ( string_to_set1 != NULL && g_utf8_strlen(string_to_set1, -1)>0 ) //&& atoi(string_to_set1)>0 )
+ if (!et_str_empty (track_total))
{
msg = g_strdup_printf (_("Selected files tagged with track like ‘xx/%s’"),
- string_to_set1);
+ track_total);
}
else
{
msg = g_strdup (_("Removed track number from selected files"));
}
+
+ g_free (track_total);
}
else if (object == G_OBJECT (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(priv->genre_combo_entry))),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -467,7 +489,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_genre (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with genre ‘%s’"),
string_to_set);
@@ -486,7 +509,7 @@ on_apply_to_selection (GObject *object,
//gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(textbuffer),&start_iter,&end_iter);
//string_to_set = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(textbuffer),&start_iter,&end_iter,TRUE);
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->comment_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->comment_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -496,7 +519,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_comment (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with comment ‘%s’"),
string_to_set);
@@ -508,7 +532,8 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->composer_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->composer_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->composer_entry));
+
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
etfile = (ET_File *)l->data;
@@ -517,7 +542,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_composer (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with composer ‘%s’"),
string_to_set);
@@ -529,7 +555,7 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->orig_artist_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->orig_artist_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->orig_artist_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -539,7 +565,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_orig_artist (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with original artist ‘%s’"),
string_to_set);
@@ -551,7 +578,7 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->copyright_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->copyright_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->copyright_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -561,7 +588,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_copyright (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with copyright ‘%s’"),
string_to_set);
@@ -573,7 +601,7 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->url_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->url_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY( priv->url_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -583,7 +611,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_url (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with URL ‘%s’"),
string_to_set);
@@ -595,7 +624,7 @@ on_apply_to_selection (GObject *object,
}
else if (object == G_OBJECT (priv->encoded_by_entry))
{
- string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->encoded_by_entry),0,-1);
+ string_to_set = gtk_entry_get_text (GTK_ENTRY (priv->encoded_by_entry));
for (l = etfilelist; l != NULL; l = g_list_next (l))
{
@@ -605,7 +634,8 @@ on_apply_to_selection (GObject *object,
et_file_tag_set_encoded_by (FileTag, string_to_set);
ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
}
- if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+
+ if (!et_str_empty (string_to_set))
{
msg = g_strdup_printf (_("Selected files tagged with encoder name ‘%s’"),
string_to_set);
@@ -663,7 +693,7 @@ on_apply_to_selection (GObject *object,
et_application_window_browser_refresh_list (window);
/* Display the current file (Needed when sequencing tracks) */
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (window, ETCore->ETFileDisplayed);
if (msg)
{
@@ -671,8 +701,6 @@ on_apply_to_selection (GObject *object,
et_application_window_status_bar_message (window, msg,TRUE);
g_free(msg);
}
- g_free(string_to_set);
- g_free(string_to_set1);
/* To update state of Undo button */
et_application_window_update_actions (window);
@@ -1555,10 +1583,12 @@ on_picture_add_button_clicked (GObject *object,
init_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow));
}
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
+
if (ETCore->ETFileDisplayed)
{
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
- ET_Display_File_Data_To_UI (ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (ET_APPLICATION_WINDOW (MainWindow),
+ ETCore->ETFileDisplayed);
}
gtk_widget_destroy(FileSelectionWindow);
@@ -1763,12 +1793,14 @@ on_picture_properties_button_clicked (GObject *object,
pic_info = et_picture_format_info (pic,
ETCore->ETFileDisplayed->ETFileDescription->TagType);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- PICTURE_COLUMN_TEXT, pic_info, -1);
+ PICTURE_COLUMN_TEXT, pic_info,
+ PICTURE_COLUMN_DATA, pic, -1);
g_free (pic_info);
}
}
gtk_widget_destroy (PictureTypesWindow);
+ et_picture_free (pic);
}
g_list_free_full (selection_list, (GDestroyNotify)gtk_tree_path_free);
@@ -1862,8 +1894,8 @@ on_picture_save_button_clicked (GObject *object,
if (init_dir)
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
- // Suggest a filename to the user
- if ( pic->description && strlen(pic->description) )
+ /* Suggest a filename to the user. */
+ if (!et_str_empty (pic->description))
{
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(FileSelectionWindow), pic->description); //filename in UTF8
}else
@@ -1998,7 +2030,7 @@ on_picture_view_drag_data (GtkWidget *widget, GdkDragContext *dc,
uri = uri_list = g_strsplit ((const gchar *)gtk_selection_data_get_data (selection_data),
"\r\n", 0);
- while (*uri && strlen(*uri))
+ while (!et_str_empty (*uri))
{
GFile *file = g_file_new_for_uri (*uri);
@@ -2052,10 +2084,12 @@ on_picture_clear_button_clicked (GObject *object,
gtk_tree_row_reference_free (l->data);
}
+ et_application_window_update_et_file_from_ui (ET_APPLICATION_WINDOW (MainWindow));
+
if (ETCore->ETFileDisplayed)
{
- ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
- ET_Display_File_Data_To_UI (ETCore->ETFileDisplayed);
+ et_application_window_display_et_file (ET_APPLICATION_WINDOW (MainWindow),
+ ETCore->ETFileDisplayed);
}
g_list_free (refs);
@@ -2762,7 +2796,7 @@ et_tag_area_create_file_tag (EtTagArea *self)
separator = g_utf8_strchr (buffer, -1, '/');
- if (separator != NULL && g_utf8_strlen (separator + 1, -1) > 0)
+ if (separator && *(separator + 1))
{
/* Copy before the separator for the disc number, beyond the
* separator for the total number of discs. */
@@ -3018,7 +3052,7 @@ et_tag_area_display_et_file (EtTagArea *self,
/* FIXME: Translatable string. */
Log_Print (LOG_ERROR,
"FileTag: Undefined tag type %d for file %s.",
- ETFile->ETFileDescription->TagType,
+ (gint)ETFile->ETFileDescription->TagType,
((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8);
break;
}
@@ -3249,7 +3283,7 @@ et_tag_area_display_et_file (EtTagArea *self,
/* Get page "Images" of the notebook. */
page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 1);
- string = g_strdup_printf (_("Images (%d)"), nbr_pic);
+ string = g_strdup_printf (_("Images (%u)"), nbr_pic);
/* Update the notebook tab. */
gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (priv->notebook), page,
string);
diff --git a/src/tags/ape_tag.c b/src/tags/ape_tag.c
index d808217..91db733 100644
--- a/src/tags/ape_tag.c
+++ b/src/tags/ape_tag.c
@@ -243,7 +243,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/*********
* Title *
*********/
- if ( FileTag->title && g_utf8_strlen(FileTag->title, -1) > 0)
+ if (!et_str_empty (FileTag->title))
apefrm_add(ape_mem, 0, APE_TAG_FIELD_TITLE, FileTag->title);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_TITLE);
@@ -252,13 +252,13 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/**********
* Artist *
**********/
- if ( FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
+ if (!et_str_empty (FileTag->artist))
apefrm_add(ape_mem, 0, APE_TAG_FIELD_ARTIST, FileTag->artist);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_ARTIST);
/* Album artist. */
- if (FileTag->album_artist && g_utf8_strlen (FileTag->album_artist, -1) > 0)
+ if (!et_str_empty (FileTag->album_artist))
{
apefrm_add (ape_mem, 0, APE_TAG_FIELD_ALBUMARTIST,
FileTag->album_artist);
@@ -271,7 +271,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/*********
* Album *
*********/
- if ( FileTag->album && g_utf8_strlen(FileTag->album, -1) > 0)
+ if (!et_str_empty (FileTag->album))
apefrm_add(ape_mem, 0, APE_TAG_FIELD_ALBUM, FileTag->album);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_ALBUM);
@@ -279,9 +279,9 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/******************************
* Disc Number and Disc Total *
******************************/
- if (FileTag->disc_number && g_utf8_strlen (FileTag->disc_number, -1) > 0)
+ if (!et_str_empty (FileTag->disc_number))
{
- if (FileTag->disc_total && g_utf8_strlen (FileTag->disc_total, -1) > 0)
+ if (!et_str_empty (FileTag->disc_total))
{
string = g_strconcat (FileTag->disc_number, "/",
FileTag->disc_total, NULL);
@@ -302,7 +302,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/********
* Year *
********/
- if ( FileTag->year && g_utf8_strlen(FileTag->year, -1) > 0)
+ if (!et_str_empty (FileTag->year))
apefrm_add(ape_mem, 0, APE_TAG_FIELD_YEAR, FileTag->year);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_YEAR);
@@ -310,9 +310,9 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/*************************
* Track and Total Track *
*************************/
- if ( FileTag->track && g_utf8_strlen(FileTag->track, -1) > 0)
+ if (!et_str_empty (FileTag->track))
{
- if ( FileTag->track_total && g_utf8_strlen(FileTag->track_total, -1) > 0 )
+ if (!et_str_empty (FileTag->track_total))
string = g_strconcat(FileTag->track,"/",FileTag->track_total,NULL);
else
string = g_strconcat(FileTag->track,NULL);
@@ -324,7 +324,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/*********
* Genre *
*********/
- if ( FileTag->genre && g_utf8_strlen(FileTag->genre, -1) > 0)
+ if (!et_str_empty (FileTag->genre))
apefrm_add(ape_mem, 0, APE_TAG_FIELD_GENRE, FileTag->genre);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_GENRE);
@@ -332,7 +332,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/***********
* Comment *
***********/
- if ( FileTag->comment && g_utf8_strlen(FileTag->comment, -1) > 0)
+ if (!et_str_empty (FileTag->comment))
apefrm_add (ape_mem, 0, APE_TAG_FIELD_COMMENT, FileTag->comment);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_COMMENT);
@@ -340,7 +340,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/************
* Composer *
************/
- if ( FileTag->composer && g_utf8_strlen(FileTag->composer, -1) > 0)
+ if (!et_str_empty (FileTag->composer))
apefrm_add(ape_mem, 0, APE_TAG_FIELD_COMPOSER, FileTag->composer);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_COMPOSER);
@@ -348,7 +348,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/*******************
* Original artist *
*******************/
- if ( FileTag->orig_artist && g_utf8_strlen(FileTag->orig_artist, -1) > 0)
+ if (!et_str_empty (FileTag->orig_artist))
apefrm_add(ape_mem, 0, "Original Artist", FileTag->orig_artist);
else
apefrm_remove(ape_mem,"Original Artist");
@@ -356,7 +356,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/*************
* Copyright *
*************/
- if ( FileTag->copyright && g_utf8_strlen(FileTag->copyright, -1) > 0)
+ if (!et_str_empty (FileTag->copyright))
apefrm_add(ape_mem, 0, APE_TAG_FIELD_COPYRIGHT, FileTag->copyright);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_COPYRIGHT);
@@ -364,7 +364,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/*******
* URL *
*******/
- if ( FileTag->url && g_utf8_strlen(FileTag->url, -1) > 0)
+ if (!et_str_empty (FileTag->url))
apefrm_add(ape_mem, 0, APE_TAG_FIELD_RELATED_URL, FileTag->url);
else
apefrm_remove(ape_mem,APE_TAG_FIELD_RELATED_URL);
@@ -372,7 +372,7 @@ ape_tag_write_file_tag (const ET_File *ETFile,
/**************
* Encoded by *
**************/
- if ( FileTag->encoded_by && g_utf8_strlen(FileTag->encoded_by, -1) > 0)
+ if (!et_str_empty (FileTag->encoded_by))
apefrm_add(ape_mem, 0, "Encoded By", FileTag->encoded_by);
else
apefrm_remove(ape_mem,"Encoded By");
diff --git a/src/tags/flac_private.c b/src/tags/flac_private.c
index bdda107..8c7175d 100644
--- a/src/tags/flac_private.c
+++ b/src/tags/flac_private.c
@@ -18,6 +18,8 @@
#include "flac_private.h"
+#ifdef ENABLE_FLAC
+
#include <errno.h>
#include <unistd.h>
@@ -178,3 +180,5 @@ et_flac_write_close_func (FLAC__IOHandle handle)
/* Always return success. */
return 0;
}
+
+#endif /* ENABLE_FLAC */
diff --git a/src/tags/flac_tag.c b/src/tags/flac_tag.c
index 5e97c2f..f2f4f01 100644
--- a/src/tags/flac_tag.c
+++ b/src/tags/flac_tag.c
@@ -162,7 +162,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -190,7 +191,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -218,7 +220,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -246,7 +249,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -273,7 +277,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if (field_value && g_utf8_strlen (field_value, -1) > 0)
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup (field_value,
@@ -297,7 +302,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -330,7 +336,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -353,7 +360,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -376,7 +384,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -409,7 +418,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -457,7 +467,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -485,7 +496,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -513,7 +525,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -541,7 +554,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -569,7 +583,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -597,7 +612,8 @@ flac_tag_read_file_tag (GFile *file,
if (field_value)
{
field_value++;
- if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+
+ if (!et_str_empty (field_value))
{
field_len = field->length - (field_value - (gchar*) field->entry);
field_value_tmp = g_strndup(field_value, field_len);
@@ -695,9 +711,7 @@ flac_tag_read_file_tag (GFile *file,
&& FileTag->encoded_by == NULL
&& FileTag->picture == NULL)
{
- gboolean rc;
-
- rc = id3tag_read_file_tag (file, FileTag, NULL);
+ id3tag_read_file_tag (file, FileTag, NULL);
// If an ID3 tag has been found (and no FLAC tag), we mark the file as
// unsaved to rewrite a flac tag.
@@ -721,8 +735,6 @@ flac_tag_read_file_tag (GFile *file,
{
FileTag->saved = FALSE;
}
-
- return rc;
}
#endif
@@ -1190,7 +1202,7 @@ flac_tag_write_file_tag (const ET_File *ETFile,
{
// Delete the ID3 tags (create a dummy ETFile for the Id3tag_... function)
ET_File *ETFile_tmp = ET_File_Item_New();
- File_Name *FileName_tmp = ET_File_Name_Item_New();
+ File_Name *FileName_tmp = et_file_name_new ();
File_Tag *FileTag_tmp = et_file_tag_new ();
// Same file...
FileName_tmp->value = g_strdup(filename);
diff --git a/src/tags/id3_tag.c b/src/tags/id3_tag.c
index e192c67..bd48e3a 100644
--- a/src/tags/id3_tag.c
+++ b/src/tags/id3_tag.c
@@ -67,9 +67,6 @@ ID3_C_EXPORT size_t ID3Tag_Link_1 (ID3Tag *id3tag, const char *filename)
ID3_C_EXPORT size_t ID3Field_GetASCII_1 (const ID3Field *field, char *buffer, size_t maxChars, size_t itemNum);
ID3_C_EXPORT size_t ID3Field_GetUNICODE_1 (const ID3Field *field, unicode_t *buffer, size_t maxChars, size_t itemNum);
-static gboolean et_id3tag_check_if_file_is_corrupted (GFile *file,
- GError **error);
-
static gboolean id3tag_check_if_id3lib_is_buggy (GError **error);
@@ -196,7 +193,7 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
/* FIXME: Handle this in the caller instead. */
/* This is a protection against a bug in id3lib that enters an infinite
* loop with corrupted MP3 files (files containing only zeroes) */
- if (et_id3tag_check_if_file_is_corrupted (file, error))
+ if (!et_id3tag_check_if_file_is_valid (file, error))
{
GtkWidget *msgdialog;
gchar *basename;
@@ -246,7 +243,7 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_TITLE)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->title && g_utf8_strlen(FileTag->title, -1) > 0)
+ if (!et_str_empty (FileTag->title))
{
id3_frame = ID3Frame_NewID(ID3FID_TITLE);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -260,7 +257,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
**********/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_LEADARTIST)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
+
+ if (!et_str_empty (FileTag->artist))
{
id3_frame = ID3Frame_NewID(ID3FID_LEADARTIST);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -273,7 +271,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
***************/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_BAND)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->album_artist && g_utf8_strlen(FileTag->album_artist, -1) > 0)
+
+ if (!et_str_empty (FileTag->album_artist))
{
id3_frame = ID3Frame_NewID(ID3FID_BAND);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -286,7 +285,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
*********/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_ALBUM)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->album && g_utf8_strlen(FileTag->album, -1) > 0)
+
+ if (!et_str_empty (FileTag->album))
{
id3_frame = ID3Frame_NewID(ID3FID_ALBUM);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -300,7 +300,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
*****************************/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_PARTINSET)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->disc_number && g_utf8_strlen(FileTag->disc_number, -1) > 0)
+
+ if (!et_str_empty (FileTag->disc_number))
{
id3_frame = ID3Frame_NewID (ID3FID_PARTINSET);
ID3Tag_AttachFrame (id3_tag, id3_frame);
@@ -316,7 +317,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
********/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_YEAR)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->year && g_utf8_strlen(FileTag->year, -1) > 0)
+
+ if (!et_str_empty (FileTag->year))
{
id3_frame = ID3Frame_NewID(ID3FID_YEAR);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -330,12 +332,13 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
*************************/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_TRACKNUM)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->track && g_utf8_strlen(FileTag->track, -1) > 0)
+
+ if (!et_str_empty (FileTag->track))
{
id3_frame = ID3Frame_NewID(ID3FID_TRACKNUM);
ID3Tag_AttachFrame(id3_tag,id3_frame);
- if ( FileTag->track_total && g_utf8_strlen(FileTag->track_total, -1) > 0)
+ if (!et_str_empty (FileTag->track_total))
string1 = g_strconcat(FileTag->track,"/",FileTag->track_total,NULL);
else
string1 = g_strdup(FileTag->track);
@@ -355,7 +358,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
*/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_CONTENTTYPE)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->genre && strlen(FileTag->genre)>0 )
+
+ if (!et_str_empty (FileTag->genre))
{
gchar *genre_string_tmp;
guchar genre_value;
@@ -386,7 +390,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
***********/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_COMMENT)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->comment && g_utf8_strlen(FileTag->comment, -1) > 0)
+
+ if (!et_str_empty (FileTag->comment))
{
id3_frame = ID3Frame_NewID(ID3FID_COMMENT);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -404,7 +409,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
************/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_COMPOSER)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->composer && g_utf8_strlen(FileTag->composer, -1) > 0)
+
+ if (!et_str_empty (FileTag->composer))
{
id3_frame = ID3Frame_NewID(ID3FID_COMPOSER);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -418,7 +424,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
*******************/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_ORIGARTIST)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->orig_artist && g_utf8_strlen(FileTag->orig_artist, -1) > 0)
+
+ if (!et_str_empty (FileTag->orig_artist))
{
id3_frame = ID3Frame_NewID(ID3FID_ORIGARTIST);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -432,7 +439,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
*************/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_COPYRIGHT)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->copyright && g_utf8_strlen(FileTag->copyright, -1) > 0)
+
+ if (!et_str_empty (FileTag->copyright))
{
id3_frame = ID3Frame_NewID(ID3FID_COPYRIGHT);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -446,7 +454,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
*******/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_WWWUSER)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->url && g_utf8_strlen(FileTag->url, -1) > 0)
+
+ if (!et_str_empty (FileTag->url))
{
id3_frame = ID3Frame_NewID(ID3FID_WWWUSER);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -460,7 +469,8 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
**************/
while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_ENCODEDBY)) )
ID3Tag_RemoveFrame(id3_tag,id3_frame);
- if (FileTag->encoded_by && g_utf8_strlen(FileTag->encoded_by, -1) > 0)
+
+ if (!et_str_empty (FileTag->encoded_by))
{
id3_frame = ID3Frame_NewID(ID3FID_ENCODEDBY);
ID3Tag_AttachFrame(id3_tag,id3_frame);
@@ -565,7 +575,7 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
{
// Delete the APE tag (create a dummy ETFile for the Ape_Tag_... function)
ET_File *ETFile_tmp = ET_File_Item_New();
- File_Name *FileName_tmp = ET_File_Name_Item_New();
+ File_Name *FileName_tmp = et_file_name_new ();
File_Tag *FileTag_tmp = et_file_tag_new();
// Same file...
FileName_tmp->value = g_strdup(filename);
@@ -1388,13 +1398,13 @@ Id3tag_Rules_For_ISO_Fields (const gchar *string,
* Some files which contains only zeroes create an infinite loop in id3lib...
* To generate a file with zeroes : dd if=/dev/zero bs=1M count=6 of=test-corrupted-mp3-zero-contend.mp3
*/
-static gboolean
-et_id3tag_check_if_file_is_corrupted (GFile *file, GError **error)
+gboolean
+et_id3tag_check_if_file_is_valid (GFile *file, GError **error)
{
unsigned char tmp[256];
unsigned char tmp0[256];
gssize bytes_read;
- gboolean result = TRUE;
+ gboolean valid = FALSE;
GFileInputStream *file_istream;
g_return_val_if_fail (file != NULL, FALSE);
@@ -1404,10 +1414,12 @@ et_id3tag_check_if_file_is_corrupted (GFile *file, GError **error)
if (!file_istream)
{
g_assert (error == NULL || *error != NULL);
- return result;
+ return valid;
}
- memset(&tmp0,0,256);
+ memset (&tmp0, 0, 256);
+
+ /* Keep reading until EOF. */
while ((bytes_read = g_input_stream_read (G_INPUT_STREAM (file_istream),
tmp, 256, NULL, error)) != 0)
{
@@ -1416,20 +1428,28 @@ et_id3tag_check_if_file_is_corrupted (GFile *file, GError **error)
/* Error in reading file. */
g_assert (error == NULL || *error != NULL);
g_object_unref (file_istream);
- return result;
+ return valid;
}
+ /* Break out of the loop if there is a non-zero byte in the file. */
if (memcmp (tmp, tmp0, bytes_read) != 0)
{
- result = FALSE;
+ valid = TRUE;
break;
}
}
- g_assert (error == NULL || *error == NULL);
g_object_unref (file_istream);
- return result;
+ /* The error was not set by g_input_stream_read(), so the file must be
+ * empty. */
+ if (!valid)
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
+ "Input truncated or empty");
+ }
+
+ return valid;
}
diff --git a/src/tags/id3_tag.h b/src/tags/id3_tag.h
index fd72dcc..ff26cb9 100644
--- a/src/tags/id3_tag.h
+++ b/src/tags/id3_tag.h
@@ -35,6 +35,7 @@ const gchar * Id3tag_Genre_To_String (unsigned char genre_code);
guchar Id3tag_String_To_Genre (const gchar *genre);
gchar *et_id3tag_get_tpos_from_file_tag (const File_Tag *file_tag);
+gboolean et_id3tag_check_if_file_is_valid (GFile *file, GError **error);
G_END_DECLS
diff --git a/src/tags/id3lib/id3_bugfix.h b/src/tags/id3lib/id3_bugfix.h
index f21f9ed..5eb39cf 100644
--- a/src/tags/id3lib/id3_bugfix.h
+++ b/src/tags/id3lib/id3_bugfix.h
@@ -28,13 +28,19 @@
G_BEGIN_DECLS
- ID3_C_EXPORT bool CCONV ID3Field_SetEncoding (ID3Field *field, ID3_TextEnc enc);
- ID3_C_EXPORT ID3_TextEnc CCONV ID3Field_GetEncoding (const ID3Field *field);
- ID3_C_EXPORT bool CCONV ID3Field_IsEncodable (const ID3Field *field);
- ID3_C_EXPORT ID3_FieldType CCONV ID3Field_GetType (const ID3Field *field);
- //ID3_C_EXPORT ID3_FieldID CCONV ID3Field_GetID (const ID3Field *field);
-
- ID3_C_EXPORT const Mp3_Headerinfo* CCONV ID3Tag_GetMp3HeaderInfo (ID3Tag *tag);
+#if !HAVE_DECL_ID3FIELD_SETENCODING
+ID3_C_EXPORT bool CCONV ID3Field_SetEncoding (ID3Field *field, ID3_TextEnc enc);
+#endif /* !HAVE_DECL_ID3FIELD_SETENCODING */
+#if !HAVE_DECL_ID3FIELD_GETENCODING
+ID3_C_EXPORT ID3_TextEnc CCONV ID3Field_GetEncoding (const ID3Field *field);
+#endif /* !HAVE_DECL_ID3FIELD_GETENCODING */
+#if !HAVE_DECL_ID3FIELD_ISENCODABLE
+ID3_C_EXPORT bool CCONV ID3Field_IsEncodable (const ID3Field *field);
+#endif /* !HAVE_DECL_ID3FIELD_ISENCODABLE */
+ID3_C_EXPORT ID3_FieldType CCONV ID3Field_GetType (const ID3Field *field);
+//ID3_C_EXPORT ID3_FieldID CCONV ID3Field_GetID (const ID3Field *field);
+
+ID3_C_EXPORT const Mp3_Headerinfo* CCONV ID3Tag_GetMp3HeaderInfo (ID3Tag *tag);
G_END_DECLS
diff --git a/src/tags/id3v24_tag.c b/src/tags/id3v24_tag.c
index 96a0197..f79c327 100644
--- a/src/tags/id3v24_tag.c
+++ b/src/tags/id3v24_tag.c
@@ -485,7 +485,8 @@ id3tag_read_file_tag (GFile *gfile,
update |= libid3tag_Get_Frame_Str (frame, EASYTAG_ID3_FIELD_STRING,
&description);
- pic = et_picture_new (type, description, 0, 0, bytes);
+ pic = et_picture_new (type, description ? description : "", 0, 0,
+ bytes);
g_bytes_unref (bytes);
g_free (description);
diff --git a/src/tags/libapetag/apetaglib.c b/src/tags/libapetag/apetaglib.c
index 2f407e0..d021efc 100644
--- a/src/tags/libapetag/apetaglib.c
+++ b/src/tags/libapetag/apetaglib.c
@@ -515,12 +515,12 @@ libapetag_print_mem_cnt (apetag *mem_cnt)
for (n = 0; (mem_cnt->countTag) > n; n++) {
if ( (mTag[n]->flags & ~ITEM_TEXT) == 0 ||
(mTag[n]->flags & ~ITEM_LINK) == 0 ) {
- printf (">apetaglib>PRINT>>F=%li SN=%li SV=%li N[%s] V[%s]\n",
+ printf (">apetaglib>PRINT>>F=%lu SN=%li SV=%li N[%s] V[%s]\n",
mTag[n]->flags,
(long) mTag[n]->sizeName, (long) mTag[n]->sizeValue,
mTag[n]->name, mTag[n]->value);
} else {
- printf (">apetaglib>PRINT>>F=%li SN=%li SV=%li N[%s] V=BINARY\n",
+ printf (">apetaglib>PRINT>>F=%lu SN=%li SV=%li N[%s] V=BINARY\n",
mTag[n]->flags,
(long) mTag[n]->sizeName, (long) mTag[n]->sizeValue,
mTag[n]->name);
diff --git a/src/tags/mpeg_header.c b/src/tags/mpeg_header.c
index d4b2cef..dfccbbf 100644
--- a/src/tags/mpeg_header.c
+++ b/src/tags/mpeg_header.c
@@ -24,6 +24,7 @@
#include <glib/gi18n.h>
#include <errno.h>
+#include "id3_tag.h"
#include "mpeg_header.h"
#include "misc.h"
@@ -80,6 +81,12 @@ et_mpeg_header_read_file_info (GFile *file,
g_return_val_if_fail (file != NULL || ETFileInfo != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ /* Check if the file is corrupt. */
+ if (!et_id3tag_check_if_file_is_valid (file, error))
+ {
+ return FALSE;
+ }
+
/* Get size of file */
info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
G_FILE_QUERY_INFO_NONE, NULL, error);
diff --git a/src/tags/ogg_tag.c b/src/tags/ogg_tag.c
index 159c5b2..e143852 100644
--- a/src/tags/ogg_tag.c
+++ b/src/tags/ogg_tag.c
@@ -183,7 +183,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->title==NULL)
FileTag->title = g_strdup(string);
@@ -203,7 +203,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->artist==NULL)
FileTag->artist = g_strdup(string);
@@ -222,7 +222,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->album_artist==NULL)
FileTag->album_artist = g_strdup(string);
@@ -241,7 +241,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->album==NULL)
FileTag->album = g_strdup(string);
@@ -256,11 +256,11 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
* Disc Number (Part of a Set) and Disc Total *
**********************************************/
if ((string = vorbis_comment_query (vc, "DISCNUMBER", 0)) != NULL
- && g_utf8_strlen (string, -1) > 0)
+ && !et_str_empty (string))
{
/* Check if DISCTOTAL used, else takes it in DISCNUMBER. */
if ((string1 = vorbis_comment_query (vc, "DISCTOTAL", 0)) != NULL
- && g_utf8_strlen (string1, -1) > 0)
+ && !et_str_empty (string1))
{
FileTag->disc_total = et_disc_number_to_string (atoi (string1));
}
@@ -277,7 +277,9 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
/********
* Year *
********/
- if ( (string = vorbis_comment_query(vc,"DATE",0)) != NULL && g_utf8_strlen(string, -1) > 0 )
+ string = vorbis_comment_query (vc, "DATE", 0);
+
+ if (!et_str_empty (string))
{
FileTag->year = g_strdup(string);
}
@@ -285,11 +287,13 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
/*************************
* Track and Total Track *
*************************/
- if ( (string = vorbis_comment_query(vc,"TRACKNUMBER",0)) != NULL && g_utf8_strlen(string, -1) > 0 )
+ string = vorbis_comment_query (vc, "TRACKNUMBER", 0);
+
+ if (!et_str_empty (string))
{
/* Check if TRACKTOTAL used, else takes it in TRACKNUMBER. */
if ((string1 = vorbis_comment_query (vc, "TRACKTOTAL", 0)) != NULL
- && g_utf8_strlen (string1, -1) > 0)
+ && !et_str_empty (string1))
{
FileTag->track_total = et_track_number_to_string (atoi (string1));
}
@@ -310,7 +314,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->genre==NULL)
FileTag->genre = g_strdup(string);
@@ -334,29 +338,36 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
string1 = Try_To_Validate_Utf8_String(string1);
string2 = Try_To_Validate_Utf8_String(string2);
- if ( string2 && g_utf8_strlen(string2, -1) > 0 ) // Contains comment to new specifications format and we prefer this format (field name defined)
+ /* Contains comment in new specifications format and we prefer this
+ * format (field name defined). */
+ if (!et_str_empty (string2))
{
if (FileTag->comment==NULL)
FileTag->comment = g_strdup(string2);
else
FileTag->comment = g_strconcat(FileTag->comment,MULTIFIELD_SEPARATOR,string2,NULL);
- // Frees allocated data
- if (string && g_utf8_strlen(string, -1) > 0)
+ /* Frees allocated data. */
+ if (!et_str_empty (string))
g_free(string);
- if (string1 && g_utf8_strlen(string1, -1) > 0)
+ if (!et_str_empty (string1))
g_free(string1);
- }else if ( string && g_utf8_strlen(string, -1) > 0 ) // Contains comment to Winamp format and we prefer this format (field name defined)
+ }
+ /* Contains comment to Winamp format and we prefer this format (field
+ * name defined). */
+ else if (!et_str_empty (string))
{
if (FileTag->comment==NULL)
FileTag->comment = g_strdup(string);
else
FileTag->comment = g_strconcat(FileTag->comment,MULTIFIELD_SEPARATOR,string,NULL);
- // Frees allocated data
- if (string1 && g_utf8_strlen(string1, -1) > 0)
+ /* Frees allocated data. */
+ if (!et_str_empty (string1))
g_free(string1);
- }else if ( string1 && g_utf8_strlen(string1, -1) > 0 ) // Contains comment to Xmms format only
+ }
+ /* Contains comment in XMMS format only. */
+ else if (!et_str_empty (string1))
{
if (FileTag->comment==NULL)
FileTag->comment = g_strdup(string1);
@@ -381,7 +392,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->composer==NULL)
FileTag->composer = g_strdup(string);
@@ -400,7 +411,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->orig_artist==NULL)
FileTag->orig_artist = g_strdup(string);
@@ -419,7 +430,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->copyright==NULL)
FileTag->copyright = g_strdup(string);
@@ -438,7 +449,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->url==NULL)
FileTag->url = g_strdup(string);
@@ -457,7 +468,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
{
string = Try_To_Validate_Utf8_String(string);
- if ( g_utf8_strlen(string, -1) > 0 )
+ if (!et_str_empty (string))
{
if (FileTag->encoded_by==NULL)
FileTag->encoded_by = g_strdup(string);
diff --git a/src/tags/opus_tag.h b/tests/test-file_info.c
similarity index 65%
copy from src/tags/opus_tag.h
copy to tests/test-file_info.c
index e012727..ddb6160 100644
--- a/src/tags/opus_tag.h
+++ b/tests/test-file_info.c
@@ -1,5 +1,5 @@
/* EasyTAG - tag editor for audio files
- * Copyright (C) 2014 Abhinav Jangda <abhijangda at hotmail.com>
+ * Copyright (C) 2015 David King <amigadave at amigadave.com>
*
* 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
@@ -16,16 +16,26 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef ET_OPUS_TAG_H_
-#define ET_OPUS_TAG_H_
+#include "file_info.h"
-#include <glib.h>
-#include "et_core.h"
+static void
+file_info_new (void)
+{
+ ET_File_Info *file_info;
-G_BEGIN_DECLS
+ file_info = et_file_info_new ();
-gboolean et_opus_tag_read_file_tag (GFile *file, File_Tag *FileTag, GError **error);
+ g_assert (file_info);
-G_END_DECLS
+ et_file_info_free (file_info);
+}
-#endif /* ET_OPUS_TAG_H_ */
+int
+main (int argc, char** argv)
+{
+ g_test_init (&argc, &argv, NULL);
+
+ g_test_add_func ("/file_info/new", file_info_new);
+
+ return g_test_run ();
+}
diff --git a/tests/test-file_tag.c b/tests/test-file_tag.c
new file mode 100644
index 0000000..e0b9b61
--- /dev/null
+++ b/tests/test-file_tag.c
@@ -0,0 +1,156 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2015 David King <amigadave at amigadave.com>
+ *
+ * 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.
+ */
+
+#include "file_tag.h"
+
+#include "misc.h"
+#include "picture.h"
+
+GtkWidget *MainWindow;
+GSettings *MainSettings;
+
+static void
+file_tag_new (void)
+{
+ File_Tag *file_tag;
+
+ file_tag = et_file_tag_new ();
+
+ g_assert (file_tag);
+
+ et_file_tag_free (file_tag);
+}
+
+static void
+file_tag_copy (void)
+{
+ File_Tag *tag1;
+ File_Tag *tag2;
+
+ tag1 = et_file_tag_new ();
+
+ g_assert (tag1);
+
+ et_file_tag_set_title (tag1, "foo");
+ et_file_tag_set_artist (tag1, "bar");
+ et_file_tag_set_album_artist (tag1, "baz");
+
+ g_assert_cmpstr (tag1->title, ==, "foo");
+ g_assert_cmpstr (tag1->artist, ==, "bar");
+ g_assert_cmpstr (tag1->album_artist, ==, "baz");
+
+ tag2 = et_file_tag_new ();
+
+ g_assert (tag2);
+
+ et_file_tag_copy_into (tag2, tag1);
+
+ g_assert_cmpstr (tag2->title, ==, "foo");
+ g_assert_cmpstr (tag2->artist, ==, "bar");
+ g_assert_cmpstr (tag2->album_artist, ==, "baz");
+
+ et_file_tag_free (tag2);
+ et_file_tag_free (tag1);
+}
+
+static void
+file_tag_copy_other (void)
+{
+ File_Tag *tag1;
+ File_Tag *tag2;
+ GList *l;
+
+ tag1 = et_file_tag_new ();
+
+ g_assert (tag1);
+
+ tag1->other = g_list_prepend (tag1->other, g_strdup ("foo"));
+
+ tag2 = et_file_tag_new ();
+
+ g_assert (tag2);
+
+ tag2->other = g_list_prepend (tag2->other, g_strdup ("bar"));
+
+ et_file_tag_copy_other_into (tag1, tag2);
+
+ l = tag1->other;
+ g_assert_cmpstr (l->data, ==, "foo");
+
+ l = g_list_next (l);
+ g_assert_cmpstr (l->data, ==, "bar");
+
+ et_file_tag_free (tag2);
+ et_file_tag_free (tag1);
+}
+
+static void
+file_tag_difference (void)
+{
+ File_Tag *tag1;
+ File_Tag *tag2;
+
+ tag1 = et_file_tag_new ();
+
+ g_assert (tag1);
+
+ et_file_tag_set_title (tag1, "foo：");
+
+ /* Contains a full-width colon, which should compare differently to a
+ * colon. */
+ g_assert_cmpstr (tag1->title, ==, "foo：");
+
+ tag2 = et_file_tag_new ();
+
+ g_assert (tag2);
+
+ et_file_tag_set_title (tag2, "foo:");
+
+ g_test_bug ("744897");
+ g_assert (et_file_tag_detect_difference (tag1, tag2));
+
+ et_file_tag_free (tag2);
+ et_file_tag_free (tag1);
+
+ tag1 = et_file_tag_new ();
+
+ et_file_tag_set_artist (tag1, "bar");
+
+ tag2 = et_file_tag_new ();
+
+ et_file_tag_set_artist (tag2, "baz");
+
+ g_assert (et_file_tag_detect_difference (tag1, tag2));
+
+ et_file_tag_free (tag2);
+ et_file_tag_free (tag1);
+}
+
+int
+main (int argc, char** argv)
+{
+ g_test_init (&argc, &argv, NULL);
+ g_test_bug_base ("https://bugzilla.gnome.org/show_bug.cgi?id=");
+
+ g_test_add_func ("/file_tag/new", file_tag_new);
+ g_test_add_func ("/file_tag/copy", file_tag_copy);
+ g_test_add_func ("/file_tag/copy-other", file_tag_copy_other);
+ g_test_add_func ("/file_tag/difference", file_tag_difference);
+
+ return g_test_run ();
+}
diff --git a/tests/test-misc.c b/tests/test-misc.c
index 38eaf8e..003b44f 100644
--- a/tests/test-misc.c
+++ b/tests/test-misc.c
@@ -51,12 +51,109 @@ misc_convert_duration (void)
}
}
+static void
+misc_filename_prepare (void)
+{
+ gsize i;
+
+ static const struct
+ {
+ const gchar *filename;
+ const gchar *result_replace;
+ const gchar *result;
+ } filenames[] =
+ {
+ { "foo:bar", "foo-bar", "foo:bar" },
+ { "foo" G_DIR_SEPARATOR_S "bar", "foo-bar", "foo-bar" },
+ { "foo*bar", "foo+bar", "foo*bar" },
+ { "foo?bar", "foo_bar", "foo?bar" },
+ { "foo\"bar", "foo\'bar", "foo\"bar" },
+ { "foo<bar", "foo(bar", "foo<bar" },
+ { "foo>bar", "foo)bar", "foo>bar" },
+ { "foo|bar", "foo-bar", "foo|bar" },
+ { "foo|bar*baz", "foo-bar+baz", "foo|bar*baz" }
+ /* TODO: Add more tests. */
+ };
+
+ for (i = 0; i < G_N_ELEMENTS (filenames); i++)
+ {
+ gchar *filename;
+
+ filename = g_strdup (filenames[i].filename);
+
+ /* Replace illegal characters. */
+ et_filename_prepare (filename, TRUE);
+ g_assert_cmpstr (filename, ==, filenames[i].result_replace);
+
+ g_free (filename);
+
+ filename = g_strdup (filenames[i].filename);
+
+ /* Leave illegal characters unchanged. */
+ et_filename_prepare (filename, FALSE);
+ g_assert_cmpstr (filename, ==, filenames[i].result);
+
+ g_free (filename);
+ }
+}
+
+static void
+misc_normalized_strcmp0 (void)
+{
+ static const gchar str1[] = "foo";
+ static const gchar str2[] = "bar";
+
+ g_assert_cmpint (et_normalized_strcmp0 (NULL, NULL), ==, 0);
+ g_assert_cmpint (et_normalized_strcmp0 (str1, NULL), >, 0);
+ g_assert_cmpint (et_normalized_strcmp0 (NULL, str2), <, 0);
+ g_assert_cmpint (et_normalized_strcmp0 (str1, str2), >, 0);
+}
+
+static void
+misc_str_empty (void)
+{
+ gsize i;
+ static const struct
+ {
+ const gchar *string;
+ const gboolean empty;
+ } strings[] =
+ {
+ { NULL, TRUE },
+ { "", TRUE },
+ { "\0a", TRUE },
+ { "a", FALSE }
+ };
+
+ for (i = 0; i < G_N_ELEMENTS (strings); i++)
+ {
+ gint result;
+
+ result = et_str_empty (strings[i].string);
+ g_assert (strings[i].empty == result);
+ }
+}
+
+static void
+misc_undo_key (void)
+{
+ guint undo_key;
+
+ undo_key = et_undo_key_new ();
+ g_assert_cmpint (undo_key, >, 0U);
+ g_assert_cmpint (undo_key, <, et_undo_key_new ());
+}
+
int
main (int argc, char** argv)
{
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/misc/convert-duration", misc_convert_duration);
+ g_test_add_func ("/misc/filename-prepare", misc_filename_prepare);
+ g_test_add_func ("/misc/normalized-strcmp0", misc_normalized_strcmp0);
+ g_test_add_func ("/misc/str-empty", misc_str_empty);
+ g_test_add_func ("/misc/undo-key", misc_undo_key);
return g_test_run ();
}
--
easytag packaging
More information about the pkg-multimedia-commits
mailing list