summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--CMakeL10n.txt12
-rw-r--r--CMakeLists.txt16
-rw-r--r--Doxyfile246
-rw-r--r--INSTALL19
-rw-r--r--Makefile.am26
-rw-r--r--Makefile.cvs10
-rw-r--r--NEWS1
-rw-r--r--README43
-rw-r--r--acinclude.m411834
-rw-r--r--aclocal.m4863
m---------admin0
m---------cmake0
-rw-r--r--config.h.in244
-rw-r--r--configure.files2
-rw-r--r--configure.in122
-rw-r--r--configure.in.in41
-rw-r--r--doc/CMakeLists.txt1
-rw-r--r--doc/Makefile.am3
-rw-r--r--doc/en/CMakeLists.txt1
-rw-r--r--doc/en/Makefile.am2
-rw-r--r--doc/man/CMakeLists.txt5
-rw-r--r--doc/man/kbarcode.110
-rw-r--r--fileplugin/CMakeLists.txt4
-rw-r--r--fileplugin/Makefile.am18
-rw-r--r--fileplugin/tdefile_kbarcode.h2
-rw-r--r--kbarcode.spec50
-rw-r--r--kbarcode.tdevelop193
-rw-r--r--kbarcode/CMakeL10n.txt2
-rw-r--r--kbarcode/CMakeLists.txt11
-rw-r--r--kbarcode/Makefile.am61
-rw-r--r--kbarcode/barcodecombo.cpp28
-rw-r--r--kbarcode/barcodecombo.h4
-rw-r--r--kbarcode/barcodedialog.cpp18
-rw-r--r--kbarcode/barcodedialog.h2
-rw-r--r--kbarcode/barcodedialogs.cpp16
-rw-r--r--kbarcode/barcodedialogs.h14
-rw-r--r--kbarcode/barcodeprinterdlg.cpp2
-rw-r--r--kbarcode/barcodeprinterdlg.h2
-rw-r--r--kbarcode/batchprinter.cpp18
-rw-r--r--kbarcode/batchwizard.cpp83
-rw-r--r--kbarcode/batchwizard.h2
-rw-r--r--kbarcode/commands.cpp6
-rw-r--r--kbarcode/commands.h4
-rw-r--r--kbarcode/configdialog.cpp6
-rw-r--r--kbarcode/configdialog.h2
-rw-r--r--kbarcode/confwizard.cpp8
-rw-r--r--kbarcode/confwizard.h2
-rw-r--r--kbarcode/csvfile.cpp4
-rw-r--r--kbarcode/csvimportdlg.cpp32
-rw-r--r--kbarcode/csvimportdlg.h2
-rw-r--r--kbarcode/databasebrowser.cpp20
-rw-r--r--kbarcode/databasebrowser.h2
-rw-r--r--kbarcode/definitiondialog.cpp28
-rw-r--r--kbarcode/definitiondialog.h4
-rw-r--r--kbarcode/documentitem.cpp4
-rw-r--r--kbarcode/documentitem.h3
-rw-r--r--kbarcode/documentitemdlg.cpp1
-rw-r--r--kbarcode/documentitemdlg.h2
-rw-r--r--kbarcode/dsmainwindow.cpp32
-rw-r--r--kbarcode/dsmainwindow.h2
-rw-r--r--kbarcode/dstextedit.cpp6
-rw-r--r--kbarcode/dstextedit.h2
-rw-r--r--kbarcode/encodingcombo.h2
-rw-r--r--kbarcode/imageitem.cpp6
-rw-r--r--kbarcode/kbarcode-batch.desktop2
-rw-r--r--kbarcode/kbarcode-editor.desktop2
-rw-r--r--kbarcode/kbarcode-label.desktop1
-rw-r--r--kbarcode/kbarcode-single.desktop2
-rw-r--r--kbarcode/kbarcode.cpp20
-rw-r--r--kbarcode/kbarcode.desktop8
-rw-r--r--kbarcode/kbarcode.h2
-rw-r--r--kbarcode/kbarcodesettings.cpp2
-rw-r--r--kbarcode/kbarcodesettings.h2
-rw-r--r--kbarcode/label.cpp30
-rw-r--r--kbarcode/labeleditor.cpp139
-rw-r--r--kbarcode/labeleditor.h2
-rw-r--r--kbarcode/labelutils.cpp4
-rw-r--r--kbarcode/main.cpp6
-rw-r--r--kbarcode/mimesources.cpp2
-rw-r--r--kbarcode/mimesources.h2
-rw-r--r--kbarcode/multilineeditdlg.cpp54
-rw-r--r--kbarcode/multilineeditdlg.h2
-rw-r--r--kbarcode/mycanvasitem.cpp2
-rw-r--r--kbarcode/mycanvasview.cpp34
-rw-r--r--kbarcode/mycanvasview.h10
-rw-r--r--kbarcode/mydatatable.h2
-rw-r--r--kbarcode/newlabel.cpp16
-rw-r--r--kbarcode/newlabel.h2
-rw-r--r--kbarcode/pics/Makefile.am2
-rw-r--r--kbarcode/pixmapbarcode.cpp2
-rw-r--r--kbarcode/previewdialog.cpp18
-rw-r--r--kbarcode/previewdialog.h2
-rw-r--r--kbarcode/printersettings.cpp4
-rw-r--r--kbarcode/printersettings.h2
-rw-r--r--kbarcode/printlabeldlg.h2
-rw-r--r--kbarcode/propertywidget.cpp14
-rw-r--r--kbarcode/propertywidget.h20
-rw-r--r--kbarcode/rectsettingsdlg.cpp2
-rw-r--r--kbarcode/rectsettingsdlg.h4
-rw-r--r--kbarcode/smalldialogs.cpp4
-rw-r--r--kbarcode/smalldialogs.h4
-rw-r--r--kbarcode/sqltables.cpp6
-rw-r--r--kbarcode/sqltables.h4
-rw-r--r--kbarcode/tcanvasitem.cpp4
-rw-r--r--kbarcode/tec.cpp2
-rw-r--r--kbarcode/tec.h2
-rw-r--r--kbarcode/textlineedit.cpp28
-rw-r--r--kbarcode/textlineedit.h2
-rw-r--r--kbarcode/tokendialog.cpp30
-rw-r--r--kbarcode/tokendialog.h2
-rw-r--r--kbarcode/tokenprovider.cpp2
-rw-r--r--kbarcode/xmlutils.cpp13
-rw-r--r--kbarcode/xmlutils.h4
-rw-r--r--po/CMakeLists.txt5
-rw-r--r--po/Makefile.am2
-rw-r--r--stamp-h.in0
-rw-r--r--subdirs4
-rw-r--r--translations/desktop_files/de.po93
-rw-r--r--translations/desktop_files/kbarcode-desktops.pot89
-rw-r--r--translations/desktop_files/nl.po90
-rw-r--r--translations/messages/de.po (renamed from po/de.po)376
-rw-r--r--translations/messages/el.po (renamed from po/el.po)90
-rw-r--r--translations/messages/es.po (renamed from po/es.po)90
-rw-r--r--translations/messages/fi.po (renamed from po/fi.po)90
-rw-r--r--translations/messages/fr.po (renamed from po/fr.po)92
-rw-r--r--translations/messages/hu.po (renamed from po/hu.po)90
-rw-r--r--translations/messages/it.po (renamed from po/it.po)369
-rw-r--r--translations/messages/kbarcode.pot (renamed from po/kbarcode.pot)96
-rw-r--r--translations/messages/nl.po (renamed from po/nl.po)90
-rw-r--r--translations/messages/pl.po (renamed from po/pl.po)760
-rw-r--r--translations/messages/ru.po2469
-rw-r--r--translations/messages/sv.po (renamed from po/sv.po)90
-rw-r--r--translations/messages/tr.po (renamed from po/tr.po)90
134 files changed, 4343 insertions, 15476 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4fce771..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "admin"]
- path = admin
- url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
- path = cmake
- url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index a525b71..a1029cd 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,15 +9,23 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEL10n )
##### create translation templates ##############
tde_l10n_auto_add_subdirectories( )
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/kbarcode-desktops"
+ SOURCES *.desktop
+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91dcc39..50072a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,13 +7,16 @@
############################################
-cmake_minimum_required( VERSION 2.8 )
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
#### general package setup
project( kbarcode )
-set( VERSION R14.1.0 )
#### include essential cmake modules
@@ -30,7 +33,6 @@ include( CheckCXXSourceCompiles )
#### include our cmake modules
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
@@ -73,8 +75,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
add_subdirectory( ${PROJECT_NAME} )
add_subdirectory( fileplugin )
-tde_conditional_add_subdirectory( BUILD_DOC doc )
-tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
+
+
+##### other data ################################
+
+tde_conditional_add_project_docs( BUILD_DOC )
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
##### write configure files
diff --git a/Doxyfile b/Doxyfile
deleted file mode 100644
index 91cd98b..0000000
--- a/Doxyfile
+++ /dev/null
@@ -1,246 +0,0 @@
-# Doxyfile 1.3.4-KDevelop
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = kbarcode.tdevelop
-PROJECT_NUMBER = 1.5.9
-OUTPUT_DIRECTORY =
-OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = NO
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = YES
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = /home/dominik/Desktop/Programming/kbarcode
-FILE_PATTERNS = *.c \
- *.cc \
- *.cxx \
- *.cpp \
- *.c++ \
- *.java \
- *.ii \
- *.ixx \
- *.ipp \
- *.i++ \
- *.inl \
- *.h \
- *.hh \
- *.hxx \
- *.hpp \
- *.h++ \
- *.idl \
- *.odl \
- *.cs \
- *.php \
- *.php3 \
- *.inc \
- *.C \
- *.H \
- *.tlh \
- *.diff \
- *.patch \
- *.moc \
- *.xpm \
- *.dox
-RECURSIVE = yes
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = NO
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = YES
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = yes
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-MAX_DOT_GRAPH_DEPTH = 1000
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
diff --git a/INSTALL b/INSTALL
index 02a4a07..0ab59aa 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,25 @@
Basic Installation
==================
+Kbarcode relies on cmake to build.
+
+Here are suggested default options:
+
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
+
+
+
+
+##### the following instructions, kept as a reference, are basically obsolete - October 04 2019 #####
+
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index b561a94..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = doc kbarcode fileplugin po
-
-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-
-$(top_srcdir)/subdirs:
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
- @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-
-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
-
-package-messages:
- $(MAKE) -f admin/Makefile.common package-messages
- $(MAKE) -C po merge
-
-EXTRA_DIST = admin COPYING configure.in.in
-
-dist-hook:
- cd $(top_distdir) && perl admin/am_edit -padmin
- cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
-noinst_DATA = kbarcode.spec acinclude.m4 aclocal.m4 AUTHORS ChangeLog \
- config.h.in configure configure.in configure.in.in COPYING Doxyfile INSTALL \
- libtool Makefile.am Makefile.cvs Makefile.in NEWS README stamp-h.in \
- subdirs
diff --git a/Makefile.cvs b/Makefile.cvs
deleted file mode 100644
index 4c0afd1..0000000
--- a/Makefile.cvs
+++ /dev/null
@@ -1,10 +0,0 @@
-all:
- @echo "This Makefile is only for the CVS repository"
- @echo "This will be deleted before making the distribution"
- @echo ""
- $(MAKE) -f admin/Makefile.common cvs
-
-dist:
- $(MAKE) -f admin/Makefile.common dist
-
-.SILENT:
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 0519ecb..0000000
--- a/NEWS
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/README b/README
index 0e05c15..68fea18 100644
--- a/README
+++ b/README
@@ -1,27 +1,19 @@
kBarcode
-General Information:
-Project Webpage: http://www.kbarcode.net
-Core Members: Stonki <support@stonki.de>
- Dom <domseichter@web.de>
-Mailinglist: kbarcode-users@lists.sourceforge.net
-IRC Channel: irc.openprojects.net #kbarcode
-
-
-Project Description:
-====================
-KBarcode is a barcode and label printing application for Linux and KDE 3. It can
+KBarcode is a barcode and label printing application. It can
be used to print every thing from simple business cards up to complex
labels with several barcodes (e.g. article descriptions). KBarcode
comes with an easy to use WYSIWYG label designer, a setup wizard,
batch import of labels (directly from the delivery note), thousands
of predefined labels, database managment tools and translations
in many languages. Even printing more than 10.000 labels in one go is
-no problem for KBarcode. Additionally it is a simply xbarcode
-replacement for the creation of barcodes. All major types of barcodes
-like EAN, UPC, CODE39, DataMatrix and ISBN are supported.
+no problem for KBarcode.
-It works of course on any platform supported by KDE and not only Linux!
+Additionally it is a simply xbarcode replacement for the creation of
+barcodes. All major types of barcodeslike EAN, UPC, CODE39, DataMatrix
+and ISBN are supported.
+
+It works of course on any platform supported by TDE.
Languages:
* English
@@ -34,26 +26,7 @@ Languages:
* Swedish
Requirements:
-* KDE 3.x
* GnuBarcode (RunTime)
* TBarcode(RunTime)
* ImageMackick (RunTime)
-* Qt SQL Tools (optional)
-
-Germany, 05. June 2002
- (updated 31.10.2002)
- (updated 02.02.2003)
- (updated 22.10.2003)
-
-Compiling KBarcode from CVS:
-============================
-
-To compile KBarcode from CVS you have to use the following commands:
-
-make -f admin/Makefile.common
-./configure
-make
-su
-make install
-
-Be sure to use the first step which will create the configure script for you.
+* TQt SQL Tools (optional)
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 143360d..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,11834 +0,0 @@
-## -*- autoconf -*-
-
-dnl This file is part of the KDE libraries/packages
-dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
-dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org)
-
-dnl This file is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2 of the License, or (at your option) any later version.
-
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Library General Public License for more details.
-
-dnl You should have received a copy of the GNU Library General Public License
-dnl along with this library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl Boston, MA 02110-1301, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
-dnl carried into every other module in the repository.
-dnl
-dnl Single-module modifications are best placed in configure.in for tdelibs
-dnl and tdebase or configure.in.in if present.
-
-# KDE_PATH_X_DIRECT
-dnl Internal subroutine of AC_PATH_X.
-dnl Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN([KDE_PATH_X_DIRECT],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-if test "$ac_x_includes" = NO; then
- # Guess where to find include files, by looking for this one X11 .h file.
- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
- # First, try using that file with no special directory specified.
-AC_TRY_CPP([#include <$x_direct_test_include>],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[# Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in \
- /usr/X11/include \
- /usr/X11R6/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
- \
- /usr/include/X11 \
- /usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
- \
- /usr/local/X11/include \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
- \
- /usr/local/include/X11 \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
- \
- /usr/X386/include \
- /usr/x386/include \
- /usr/XFree86/include/X11 \
- \
- /usr/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/local/x11r5/include \
- /usr/lpp/Xamples/include \
- \
- /usr/openwin/include \
- /usr/openwin/share/include \
- ; \
- do
- if test -r "$ac_dir/$x_direct_test_include"; then
- ac_x_includes=$ac_dir
- break
- fi
- done])
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
- # Check for the libraries.
-
- test -z "$x_direct_test_library" && x_direct_test_library=Xt
- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS="$LIBS"
- LIBS="-l$x_direct_test_library $LIBS"
-AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)],
-[LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=],
-[LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
- /usr/X11/lib${tdelibsuff} \
- /usr/X11R6/lib${tdelibsuff} \
- /usr/X11R5/lib${tdelibsuff} \
- /usr/X11R4/lib${tdelibsuff} \
- \
- /usr/lib${tdelibsuff}/X11 \
- /usr/lib${tdelibsuff}/X11R6 \
- /usr/lib${tdelibsuff}/X11R5 \
- /usr/lib${tdelibsuff}/X11R4 \
- \
- /usr/local/X11/lib${tdelibsuff} \
- /usr/local/X11R6/lib${tdelibsuff} \
- /usr/local/X11R5/lib${tdelibsuff} \
- /usr/local/X11R4/lib${tdelibsuff} \
- \
- /usr/local/lib${tdelibsuff}/X11 \
- /usr/local/lib${tdelibsuff}/X11R6 \
- /usr/local/lib${tdelibsuff}/X11R5 \
- /usr/local/lib${tdelibsuff}/X11R4 \
- \
- /usr/X386/lib${tdelibsuff} \
- /usr/x386/lib${tdelibsuff} \
- /usr/XFree86/lib${tdelibsuff}/X11 \
- \
- /usr/lib${tdelibsuff} \
- /usr/local/lib${tdelibsuff} \
- /usr/unsupported/lib${tdelibsuff} \
- /usr/athena/lib${tdelibsuff} \
- /usr/local/x11r5/lib${tdelibsuff} \
- /usr/lpp/Xamples/lib${tdelibsuff} \
- /lib/usr/lib${tdelibsuff}/X11 \
- \
- /usr/openwin/lib${tdelibsuff} \
- /usr/openwin/share/lib${tdelibsuff} \
- ; \
-do
-dnl Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
-done])
-fi # $ac_x_libraries = NO
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
- for j in $1;
- do
- echo "configure: __oline__: $i/$j" >&AC_FD_CC
- if test -r "$i/$j"; then
- echo "taking that" >&AC_FD_CC
- $3=$i
- break 2
- fi
- done
-done
-])
-
-dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs,
-dnl if-not-found, test-parameter, prepend-path)
-dnl
-dnl Look for program-name in list-of-dirs+$PATH.
-dnl If prepend-path is set, look in $PATH+list-of-dirs instead.
-dnl If found, $variable-name is set. If not, if-not-found is evaluated.
-dnl test-parameter: if set, the program is executed with this arg,
-dnl and only a successful exit code is required.
-AC_DEFUN([KDE_FIND_PATH],
-[
- AC_MSG_CHECKING([for $1])
- if test -n "$$2"; then
- kde_cv_path="$$2";
- else
- kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
- AC_CACHE_VAL(kde_cv_path_$kde_cache,
- [
- kde_cv_path="NONE"
- kde_save_IFS=$IFS
- IFS=':'
- dirs=""
- for dir in $PATH; do
- dirs="$dirs $dir"
- done
- if test -z "$6"; then dnl Append dirs in PATH (default)
- dirs="$3 $dirs"
- else dnl Prepend dirs in PATH (if 6th arg is set)
- dirs="$dirs $3"
- fi
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
- if test -x "$dir/$1"; then
- if test -n "$5"
- then
- evalstr="$dir/$1 $5 2>&1 "
- if eval $evalstr; then
- kde_cv_path="$dir/$1"
- break
- fi
- else
- kde_cv_path="$dir/$1"
- break
- fi
- fi
- done
-
- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
- ])
-
- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
- fi
-
- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- AC_MSG_RESULT(not found)
- $4
- else
- AC_MSG_RESULT($kde_cv_path)
- $2=$kde_cv_path
-
- fi
-])
-
-AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-[
- AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
-[
- AC_MSG_WARN([No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([KDE_CHECK_UIC_FLAG],
-[
- AC_MSG_CHECKING([whether uic supports -$1 ])
- kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
- AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
- [
- cat >conftest.ui <<EOT
- <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-EOT
- ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
- if AC_TRY_EVAL(ac_uic_testrun); then
- eval "kde_cv_prog_uic_$kde_cache=yes"
- else
- eval "kde_cv_prog_uic_$kde_cache=no"
- fi
- rm -f conftest*
- ])
-
- if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT([yes])
- :
- $3
- else
- AC_MSG_RESULT([no])
- :
- $4
- fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler and the ui compiler in the PATH,
-dnl in $TQTDIR/bin, and some more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_TQT_MOC_UIC],
-[
- AC_REQUIRE([KDE_CHECK_PERL])
- qt_bindirs=""
- for dir in $kde_qt_dirs; do
- qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
- done
- qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
- if test ! "$ac_qt_bindir" = "NO"; then
- qt_bindirs="$ac_qt_bindir $qt_bindirs"
- fi
-
- KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
- if test -z "$UIC_NOT_NEEDED"; then
- KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
- if test -z "$UIC_PATH" ; then
- KDE_UIC_ERROR_MESSAGE
- exit 1
- else
- UIC=$UIC_PATH
-
- if test $kde_qtver = 3; then
- KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
- KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-
- if test x$ac_uic_supports_libpath = xyes; then
- UIC="$UIC -L \$(kde_widgetdir)"
- fi
- if test x$ac_uic_supports_nounload = xyes; then
- UIC="$UIC -nounload"
- fi
- fi
- fi
- else
- UIC="echo uic not available: "
- fi
-
- AC_SUBST(MOC)
- AC_SUBST(UIC)
-
- UIC_TR="i18n"
- if test $kde_qtver = 3; then
- UIC_TR="tr2i18n"
- fi
-
- AC_SUBST(UIC_TR)
-])
-
-AC_DEFUN([KDE_1_CHECK_PATHS],
-[
- KDE_1_CHECK_PATH_HEADERS
-
- KDE_TEST_RPATH=
-
- if test -n "$USE_RPATH"; then
-
- if test -n "$kde_libraries"; then
- KDE_TEST_RPATH="-R $kde_libraries"
- fi
-
- if test -n "$qt_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
- fi
-
- if test -n "$x_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
- fi
-
- KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
- fi
-
-AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5'
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR([your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and tdelibs as you did use now.
-For more details about this problem, look at the end of config.log.])
-fi
-
-if eval `TDEDIR= ./conftest 2>&5`; then
- kde_result=done
-else
- kde_result=problems
-fi
-
-TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-KDE_SET_PATHS($kde_result)
-
-])
-
-AC_DEFUN([KDE_SET_PATHS],
-[
- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
- kde_htmldir=\"$kde_htmldir\" \
- kde_appsdir=\"$kde_appsdir\" \
- kde_icondir=\"$kde_icondir\" \
- kde_sounddir=\"$kde_sounddir\" \
- kde_datadir=\"$kde_datadir\" \
- kde_locale=\"$kde_locale\" \
- kde_cgidir=\"$kde_cgidir\" \
- kde_confdir=\"$kde_confdir\" \
- kde_kcfgdir=\"$kde_kcfgdir\" \
- kde_mimedir=\"$kde_mimedir\" \
- kde_toolbardir=\"$kde_toolbardir\" \
- kde_wallpaperdir=\"$kde_wallpaperdir\" \
- kde_templatesdir=\"$kde_templatesdir\" \
- kde_bindir=\"$kde_bindir\" \
- kde_servicesdir=\"$kde_servicesdir\" \
- kde_servicetypesdir=\"$kde_servicetypesdir\" \
- kde_moduledir=\"$kde_moduledir\" \
- kde_styledir=\"$kde_styledir\" \
- kde_widgetdir=\"$kde_widgetdir\" \
- xdg_appsdir=\"$xdg_appsdir\" \
- xdg_menudir=\"$xdg_menudir\" \
- xdg_directorydir=\"$xdg_directorydir\" \
- kde_result=$1"
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_PATHS],
-[
-if test "$1" = "default"; then
-
- if test -z "$kde_htmldir"; then
- kde_htmldir='\${datadir}/doc/tde/HTML'
- fi
- if test -z "$kde_appsdir"; then
- kde_appsdir='\${datadir}/applnk'
- fi
- if test -z "$kde_icondir"; then
- kde_icondir='\${datadir}/icons'
- fi
- if test -z "$kde_sounddir"; then
- kde_sounddir='\${datadir}/sounds'
- fi
- if test -z "$kde_datadir"; then
- kde_datadir='\${datadir}/apps'
- fi
- if test -z "$kde_locale"; then
- kde_locale='\${datadir}/locale'
- fi
- if test -z "$kde_cgidir"; then
- kde_cgidir='\${exec_prefix}/cgi-bin'
- fi
- if test -z "$kde_confdir"; then
- kde_confdir='\${datadir}/config'
- fi
- if test -z "$kde_kcfgdir"; then
- kde_kcfgdir='\${datadir}/config.kcfg'
- fi
- if test -z "$kde_mimedir"; then
- kde_mimedir='\${datadir}/mimelnk'
- fi
- if test -z "$kde_toolbardir"; then
- kde_toolbardir='\${datadir}/toolbar'
- fi
- if test -z "$kde_wallpaperdir"; then
- kde_wallpaperdir='\${datadir}/wallpapers'
- fi
- if test -z "$kde_templatesdir"; then
- kde_templatesdir='\${datadir}/templates'
- fi
- if test -z "$kde_bindir"; then
- kde_bindir='\${exec_prefix}/bin'
- fi
- if test -z "$kde_servicesdir"; then
- kde_servicesdir='\${datadir}/services'
- fi
- if test -z "$kde_servicetypesdir"; then
- kde_servicetypesdir='\${datadir}/servicetypes'
- fi
- if test -z "$kde_moduledir"; then
- if test "$kde_qtver" = "2"; then
- kde_moduledir='\${libdir}/kde2'
- else
- kde_moduledir='\${libdir}/trinity'
- fi
- fi
- if test -z "$kde_styledir"; then
- kde_styledir='\${libdir}/trinity/plugins/styles'
- fi
- if test -z "$kde_widgetdir"; then
- kde_widgetdir='\${libdir}/trinity/plugins/designer'
- fi
- if test -z "$xdg_appsdir"; then
- xdg_appsdir='\${datadir}/applications/tde'
- fi
- if test -z "$xdg_menudir"; then
- xdg_menudir='\${sysconfdir}/xdg/menus'
- fi
- if test -z "$xdg_directorydir"; then
- xdg_directorydir='\${datadir}/desktop-directories'
- fi
-
- KDE_SET_PATHS(defaults)
-
-else
-
- if test $kde_qtver = 1; then
- AC_MSG_RESULT([compiling])
- KDE_1_CHECK_PATHS
- else
- AC_MSG_ERROR([path checking not yet supported for KDE 2])
- fi
-
-fi
-])
-
-AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
-[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
- test -z "$kde_icondir" || test -z "$kde_sounddir" ||
- test -z "$kde_datadir" || test -z "$kde_locale" ||
- test -z "$kde_cgidir" || test -z "$kde_confdir" ||
- test -z "$kde_kcfgdir" ||
- test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
- test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
- test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
- test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
- test -z "$kde_styledir" || test -z "kde_widgetdir" ||
- test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
- test "x$kde_have_all_paths" != "xyes"; then
- kde_have_all_paths=no
- fi
-])
-
-AC_DEFUN([KDE_MISSING_PROG_ERROR],
-[
- AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed KDE correctly.
-])
-])
-
-AC_DEFUN([KDE_MISSING_ARTS_ERROR],
-[
- AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-])
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
-[
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
- test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
- if test -n "$TDEDIRS"; then
- kde_save_IFS=$IFS
- IFS=:
- for dir in $TDEDIRS; do
- kde_default_bindirs="$dir/bin $kde_default_bindirs "
- done
- IFS=$kde_save_IFS
- fi
-])
-
-AC_DEFUN([KDE_SUBST_PROGRAMS],
-[
- AC_ARG_WITH(arts,
- AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
- [build_arts=$withval],
- [build_arts=yes]
- )
- AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
- if test "$build_arts" = "no"; then
- AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
- fi
-
- KDE_SET_DEFAULT_BINDIRS
- kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
- KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
- KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
- if test "$build_arts" '!=' "no"; then
- KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
- KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
- fi
- KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-
- trinity2ornewer=1
- trinity3ornewer=1
- if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
- trinity2ornewer=
- trinity3ornewer=
- else
- if test "$kde_qtver" = "3"; then
- if test "$kde_qtsubver" -le 1; then
- trinity2ornewer=
- fi
- if test "$kde_qtsubver" -le 2; then
- trinity3ornewer=
- fi
- if test "$KDECONFIG" != "compiled"; then
- if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
- trinity3ornewer=
- fi
- fi
- fi
- fi
-
- if test -n "$trinity2ornewer"; then
- KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
- KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
- fi
- if test -n "$trinity3ornewer"; then
- KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
- AC_SUBST(MAKETDEWIDGETS)
- fi
- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
-
- if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share"
- test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
- AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
- if test "$KDE_XSL_STYLESHEET" = "NO"; then
- KDE_XSL_STYLESHEET=""
- else
- KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/tde-chunk.xsl"
- fi
- fi
-
- DCOP_DEPENDENCIES='$(DCOPIDL)'
- if test -n "$trinity2ornewer"; then
- KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
- DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
- AC_SUBST(KCONFIG_COMPILER)
- AC_SUBST(KCFG_DEPENDENCIES)
- AC_SUBST(DCOPIDLNG)
- fi
- AC_SUBST(DCOPIDL)
- AC_SUBST(DCOPIDL2CPP)
- AC_SUBST(DCOP_DEPENDENCIES)
- AC_SUBST(MCOPIDL)
- AC_SUBST(ARTSCCONFIG)
- AC_SUBST(MEINPROC)
- AC_SUBST(KDE_XSL_STYLESHEET)
- AC_SUBST(XMLLINT)
-])dnl
-
-AC_DEFUN([AC_CREATE_KFSSTND],
-[
-AC_REQUIRE([AC_CHECK_RPATH])
-
-AC_MSG_CHECKING([for KDE paths])
-kde_result=""
-kde_cached_paths=yes
-AC_CACHE_VAL(kde_cv_all_paths,
-[
- KDE_SET_DEFAULT_PATHS($1)
- kde_cached_paths=no
-])
-eval "$kde_cv_all_paths"
-KDE_CHECK_PATHS_FOR_COMPLETENESS
-if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
- # wrong values were cached, may be, we can set better ones
- kde_result=
- kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
- kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir=
- kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
- kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
- kde_have_all_paths=
- kde_styledir=
- kde_widgetdir=
- xdg_appsdir = xdg_menudir= xdg_directorydir=
- KDE_SET_DEFAULT_PATHS($1)
- eval "$kde_cv_all_paths"
- KDE_CHECK_PATHS_FOR_COMPLETENESS
- kde_result="$kde_result (cache overridden)"
-fi
-if test "$kde_have_all_paths" = "no"; then
- AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-])
-else
- rm -f conftest*
- AC_MSG_RESULT($kde_result)
-fi
-
-bindir=$kde_bindir
-
-KDE_SUBST_PROGRAMS
-
-])
-
-AC_DEFUN([AC_SUBST_KFSSTND],
-[
-AC_SUBST(kde_htmldir)
-AC_SUBST(kde_appsdir)
-AC_SUBST(kde_icondir)
-AC_SUBST(kde_sounddir)
-AC_SUBST(kde_datadir)
-AC_SUBST(kde_locale)
-AC_SUBST(kde_confdir)
-AC_SUBST(kde_kcfgdir)
-AC_SUBST(kde_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl X Desktop Group standards
-AC_SUBST(xdg_appsdir)
-AC_SUBST(xdg_menudir)
-AC_SUBST(xdg_directorydir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(kde_moduledir)
-AC_SUBST(tdeinitdir, '$(kde_moduledir)')
-AC_SUBST(kde_styledir)
-AC_SUBST(kde_widgetdir)
-if test "$kde_qtver" = 1; then
- kde_minidir="$kde_icondir/mini"
-else
-# for KDE 1 - this breaks KDE2 apps using minidir, but
-# that's the plan ;-/
- kde_minidir="/dev/null"
-fi
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN([KDE_MISC_TESTS],
-[
- dnl Checks for libraries.
- AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD
- AC_SUBST(LIBUTIL)
- AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
- AC_SUBST(LIBCOMPAT)
- kde_have_crypt=
- AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
- AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
- AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support])
- kde_have_crypt=no
- ]))
- AC_SUBST(LIBCRYPT)
- if test $kde_have_crypt = yes; then
- AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
- fi
- AC_CHECK_SOCKLEN_T
- AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- AC_CHECK_LIB(dnet_stub, dnet_ntoa,
- [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
- fi
- AC_CHECK_FUNC(inet_ntoa)
- if test $ac_cv_func_inet_ntoa = no; then
- AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
- fi
- AC_CHECK_FUNC(connect)
- if test $ac_cv_func_connect = no; then
- AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
- $X_EXTRA_LIBS)
- fi
-
- AC_CHECK_FUNC(remove)
- if test $ac_cv_func_remove = no; then
- AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- AC_CHECK_FUNC(shmat, ,
- AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-
- # more headers that need to be explicitly included on darwin
- AC_CHECK_HEADERS(sys/types.h stdint.h)
-
- # sys/bitypes.h is needed for uint32_t and friends on Tru64
- AC_CHECK_HEADERS(sys/bitypes.h)
-
- # darwin requires a poll emulation library
- AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
-
- # for some image handling on Mac OS X
- AC_CHECK_HEADERS(Carbon/Carbon.h)
-
- # CoreAudio framework
- AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
- AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
- FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
- ])
-
- AC_CHECK_RES_INIT
- AC_SUBST(LIB_POLL)
- AC_SUBST(FRAMEWORK_COREAUDIO)
- LIBSOCKET="$X_EXTRA_LIBS"
- AC_SUBST(LIBSOCKET)
- AC_SUBST(X_EXTRA_LIBS)
- AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
- AC_SUBST(LIBUCB)
-
- case $host in dnl this *is* LynxOS specific
- *-*-lynxos* )
- AC_MSG_CHECKING([LynxOS header file wrappers])
- [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
- AC_MSG_RESULT(disabled)
- AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
- ;;
- esac
-
- KDE_CHECK_TYPES
- KDE_CHECK_LIBDL
- KDE_CHECK_STRLCPY
- KDE_CHECK_PIE_SUPPORT
-
-# darwin needs this to initialize the environment
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
-
-AH_VERBATIM(_DARWIN_ENVIRON,
-[
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-])
-
-AH_VERBATIM(_AIX_STRINGS_H_BZERO,
-[
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-])
-
-AC_CHECK_FUNCS([vsnprintf snprintf])
-
-AH_VERBATIM(_TRU64,[
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the header files and libraries for X-Windows. Extended the
-dnl macro AC_PATH_X
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([K_PATH_X],
-[
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_ARG_ENABLE(
- embedded,
- AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
- kde_use_qt_emb=$enableval,
- kde_use_qt_emb=no
-)
-
-AC_ARG_ENABLE(
- qtopia,
- AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
- kde_use_qt_emb_palm=$enableval,
- kde_use_qt_emb_palm=no
-)
-
-AC_ARG_ENABLE(
- mac,
- AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
- kde_use_qt_mac=$enableval,
- kde_use_qt_mac=no
-)
-
-# used to disable x11-specific stuff on special platforms
-AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
-
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-AC_MSG_CHECKING(for X)
-
-AC_CACHE_VAL(kde_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
- kde_x_includes=NO
-else
- kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
- kde_x_libraries=NO
-else
- kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-KDE_PATH_X_DIRECT
-dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
-dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
-dnl location. The correct location is /usr/lib32 or an undefined value
-dnl (the linker is smart enough to pick the correct default library).
-dnl Things work just fine if you use just AC_PATH_X_DIRECT.
-dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
-dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
-dnl x_includes should be left alone.
-case "$host" in
-mips-sgi-irix6*)
- ;;
-*-*-solaris*)
- ;;
-*)
- _AC_PATH_X_XMKMF
- if test -z "$ac_x_includes"; then
- ac_x_includes="."
- fi
- if test -z "$ac_x_libraries"; then
- ac_x_libraries="/usr/lib${tdelibsuff}"
- fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
- kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
- kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
- AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-fi
-
-if test "$kde_x_libraries" = NO; then
- AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
- kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-])dnl
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
- AC_MSG_RESULT($have_x)
- no_x=yes
-else
- AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
- X_INCLUDES=""
- x_includes="."; dnl better than nothing :-
- else
- x_includes=$kde_x_includes
- X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
- X_LDFLAGS=""
- x_libraries="/usr/lib"; dnl better than nothing :-
- else
- x_libraries=$kde_x_libraries
- X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols. So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-AC_CHECK_LIB(ICE, IceConnectionNumber,
- [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-AC_MSG_CHECKING(for libXext)
-AC_CACHE_VAL(kde_cv_have_libXext,
-[
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-AC_TRY_LINK([
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-],
-[
-printf("hello Xext\n");
-],
-kde_cv_have_libXext=yes,
-kde_cv_have_libXext=no
-)
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_libXext)
-
-if test "$kde_cv_have_libXext" = "no"; then
- AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either.])
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
- dnl We're using QT Embedded
- CPPFLAGS=-DQWS
- CXXFLAGS="$CXXFLAGS -fno-rtti"
- QTE_NORTTI="-fno-rtti -DQWS"
- X_PRE_LIBS=""
- LIB_X11=""
- LIB_XEXT=""
- LIB_XRENDER=""
- LIBSM=""
- X_INCLUDES=""
- X_LDFLAGS=""
- x_includes=""
- x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
- dnl be included to get the information) --Sam
- CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
- CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
- X_PRE_LIBS=""
- LIB_X11=""
- LIB_XEXT=""
- LIB_XRENDER=""
- LIBSM=""
- X_INCLUDES=""
- X_LDFLAGS=""
- x_includes=""
- x_libraries=""
-fi
-AC_SUBST(X_PRE_LIBS)
-AC_SUBST(LIB_X11)
-AC_SUBST(LIB_XRENDER)
-AC_SUBST(LIBSM)
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
-AC_SUBST(QTE_NORTTI)
-AC_SUBST(LIB_XEXT)
-
-])
-
-AC_DEFUN([KDE_PRINT_QT_PROGRAM],
-[
-AC_REQUIRE([KDE_USE_TQT])
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if TQT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
- QStringList *t = new QStringList();
- Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
- QString s;
- s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
- (void)QStyleFactory::create(QString::null);
- QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
- return 0;
-}
-EOF
-])
-
-AC_DEFUN([KDE_USE_TQT],
-[
-if test -z "$1"; then
- # Current default Qt version: 3.3
- kde_qtver=3
- kde_qtsubver=3
-else
- kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
- # following is the check if subversion isnt found in passed argument
- if test "$kde_qtsubver" = "$1"; then
- kde_qtsubver=1
- fi
- kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
- if test "$kde_qtver" = "1"; then
- kde_qtsubver=42
- fi
-fi
-
-if test -z "$2"; then
- if test "$kde_qtver" = "2"; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_minversion=">= Qt 2.2.2"
- else
- kde_qt_minversion=">= Qt 2.0.2"
- fi
- fi
- if test "$kde_qtver" = "3"; then
- if test $kde_qtsubver -gt 0; then
- if test $kde_qtsubver -gt 1; then
- if test $kde_qtsubver -gt 2; then
- kde_qt_minversion=">= Qt 3.3 and < 4.0"
- else
- kde_qt_minversion=">= Qt 3.2 and < 4.0"
- fi
- else
- kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
- fi
- else
- kde_qt_minversion=">= Qt 3.0 and < 4.0"
- fi
- fi
- if test "$kde_qtver" = "1"; then
- kde_qt_minversion=">= 1.42 and < 2.0"
- fi
-else
- kde_qt_minversion="$2"
-fi
-
-if test -z "$3"; then
- if test $kde_qtver = 3; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
- qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
- kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
- else
- kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
- fi
- fi
- if test $kde_qtver = 2; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="TQT_VERSION >= 222"
- else
- kde_qt_verstring="TQT_VERSION >= 200"
- fi
- fi
- if test $kde_qtver = 1; then
- kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
- fi
-else
- kde_qt_verstring="$3"
-fi
-
-if test $kde_qtver = 4; then
- kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
-fi
-if test $kde_qtver = 3; then
- kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-fi
-if test $kde_qtver = 2; then
- kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt"
-fi
-if test $kde_qtver = 1; then
- kde_qt_dirs="$TQTDIR /usr/lib/qt"
-fi
-])
-
-AC_DEFUN([KDE_CHECK_QT_DIRECT],
-[
-AC_REQUIRE([KDE_USE_TQT])
-AC_MSG_CHECKING([if Qt compiles without flags])
-AC_CACHE_VAL(kde_cv_qt_direct,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$tqt_includes"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET"
-else
-LIBS="$LIBTQT $LIBSOCKET"
-fi
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- kde_cv_qt_direct="yes"
-else
- kde_cv_qt_direct="no"
- echo "configure: failed program was:" >&AC_FD_CC
- cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_qt_direct" = "yes"; then
- AC_MSG_RESULT(yes)
- $1
-else
- AC_MSG_RESULT(no)
- $2
-fi
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
-dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed)
-dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_TQT_1_3],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([KDE_USE_TQT])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
- mt,
- AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
- kde_use_qt_mt=$enableval,
- [
- if test $kde_qtver = 3; then
- kde_use_qt_mt=yes
- else
- kde_use_qt_mt=no
- fi
- ]
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-KDE_MT_LDFLAGS=
-KDE_MT_LIBS=
-if test "x$kde_use_qt_mt" = "xyes"; then
- KDE_CHECK_THREADING
- if test "x$kde_use_threading" = "xyes"; then
- CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
- KDE_MT_LDFLAGS="$USE_THREADS"
- KDE_MT_LIBS="$LIBPTHREAD"
- else
- kde_use_qt_mt=no
- fi
-fi
-AC_SUBST(KDE_MT_LDFLAGS)
-AC_SUBST(KDE_MT_LIBS)
-
-kde_qt_was_given=yes
-
-dnl ------------------------------------------------------------------------
-dnl If we haven't been told how to link to Qt, we work it out for ourselves.
-dnl ------------------------------------------------------------------------
-if test -z "$LIBTQT_GLOB"; then
- if test "x$kde_use_qt_emb" = "xyes"; then
- LIBTQT_GLOB="libtqte.*"
- else
- LIBTQT_GLOB="libtqt.*"
- fi
-fi
-
-dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
-dnl ------------------------------------------------------------
-if test "x$kde_use_qt_emb" = "xyes"; then
- tqtlib="qte"
-else
- tqtlib="qt"
-fi
-
-kde_int_qt="-l$tqtlib"
-
-if test -z "$LIBQPE"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-palmtop then add -lqpe to the link line
-dnl ------------------------------------------------------------
- if test "x$kde_use_qt_emb" = "xyes"; then
- if test "x$kde_use_qt_emb_palm" = "xyes"; then
- LIB_QPE="-lqpe"
- else
- LIB_QPE=""
- fi
- else
- LIB_QPE=""
- fi
-fi
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
- LIBTQT="-l$tqtlib-mt"
- kde_int_qt="-l$tqtlib-mt"
- LIBTQT_GLOB="lib$tqtlib-mt.*"
- USING_QT_MT="using -mt"
-else
- LIBTQT="-l$tqtlib"
-fi
-
-if test $kde_qtver != 1; then
-
- AC_REQUIRE([AC_FIND_PNG])
- AC_REQUIRE([AC_FIND_JPEG])
- LIBTQT="$LIBTQT $LIBPNG $LIBJPEG"
-fi
-
-if test $kde_qtver = 3; then
- AC_REQUIRE([KDE_CHECK_LIBDL])
- LIBTQT="$LIBTQT $LIBDL"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-fi
-ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-tqt_includes=""
-AC_ARG_WITH(qt-dir,
- AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
- [ ac_tqt_includes="$withval"/include
- ac_qt_libraries="$withval"/lib${tdelibsuff}
- ac_qt_bindir="$withval"/bin
- ])
-
-AC_ARG_WITH(qt-includes,
- AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
- [
- ac_tqt_includes="$withval"
- ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
- AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
- [ ac_qt_libraries="$withval"
- kde_qt_libs_given=yes
- ])
-
-AC_CACHE_VAL(ac_cv_have_qt,
-[#try to guess Qt locations
-
-qt_incdirs=""
-for dir in $kde_qt_dirs; do
- qt_incdirs="$qt_incdirs $dir/include $dir"
-done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-if test ! "$ac_tqt_includes" = "NO"; then
- qt_incdirs="$ac_tqt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" != "1"; then
- kde_qt_header=qstyle.h
-else
- kde_qt_header=qglobal.h
-fi
-
-AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-ac_tqt_includes="$qt_incdir"
-
-qt_libdirs=""
-for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
-done
-qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-if test ! "$ac_qt_libraries" = "NO"; then
- qt_libdir=$ac_qt_libraries
-else
- qt_libdirs="$ac_qt_libraries $qt_libdirs"
- # if the Qt was given, the chance is too big that libtqt.* doesn't exist
- qt_libdir=NONE
- for dir in $qt_libdirs; do
- try="ls -1 $dir/${LIBTQT_GLOB}"
- if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
- done
-fi
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
- if test -e "$a"; then
- LIBTQT="$LIBTQT ${kde_int_qt}_incremental"
- break
- fi
-done
-
-ac_qt_libraries="$qt_libdir"
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-LIBS="$LIBS $LIBTQT $KDE_MT_LIBS"
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- rm -f conftest*
-else
- echo "configure: failed program was:" >&AC_FD_CC
- cat conftest.$ac_ext >&AC_FD_CC
- ac_qt_libraries="NO"
-fi
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-AC_LANG_RESTORE
-if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then
- ac_cv_have_qt="have_qt=no"
- ac_qt_notfound=""
- missing_qt_mt=""
- if test "$ac_tqt_includes" = NO; then
- if test "$ac_qt_libraries" = NO; then
- ac_qt_notfound="(headers and libraries)";
- else
- ac_qt_notfound="(headers)";
- fi
- else
- if test "x$kde_use_qt_mt" = "xyes"; then
- missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
- ac_qt_notfound="(library $tqtlib-mt)";
- else
- ac_qt_notfound="(library $tqtlib)";
- fi
- fi
-
- AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-For more details about this problem, look at the end of config.log.$missing_qt_mt])
-else
- have_qt="yes"
-fi
-])
-
-eval "$ac_cv_have_qt"
-
-if test "$have_qt" != yes; then
- AC_MSG_RESULT([$have_qt]);
-else
- ac_cv_have_qt="have_qt=yes \
- ac_tqt_includes=$ac_tqt_includes ac_qt_libraries=$ac_qt_libraries"
- AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_tqt_includes $USING_QT_MT])
-
- qt_libraries="$ac_qt_libraries"
- tqt_includes="$ac_tqt_includes"
-fi
-
-if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
- KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
-fi
-
-AC_SUBST(qt_libraries)
-AC_SUBST(tqt_includes)
-
-if test "$tqt_includes" = "$x_includes" || test -z "$tqt_includes"; then
- TQT_INCLUDES=""
-else
- TQT_INCLUDES="-I$tqt_includes"
- all_includes="$TQT_INCLUDES $all_includes"
-fi
-
-if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
- QT_LDFLAGS=""
-else
- QT_LDFLAGS="-L$qt_libraries"
- all_libraries="$QT_LDFLAGS $all_libraries"
-fi
-test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-
-AC_SUBST(TQT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_TQT_MOC_UIC
-
-KDE_CHECK_QT_JPEG
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-else
-LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-fi
-test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
- if test -e "$a"; then
- LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
- break
- fi
-done
-
-AC_SUBST(LIB_TQT)
-AC_SUBST(LIB_QPE)
-
-AC_SUBST(kde_qtver)
-])
-
-AC_DEFUN([AC_PATH_TQT],
-[
-AC_PATH_TQT_1_3
-])
-
-AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
-[
-AC_REQUIRE([AC_PATH_TQT_MOC_UIC])
-
-if test x$ac_uic_supports_libpath = xyes; then
-
-AC_MSG_CHECKING([if UIC has KDE plugins available])
-AC_CACHE_VAL(kde_cv_uic_plugins,
-[
-cat > actest.ui << EOF
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>NewConnectionDialog</class>
-<widget class="QDialog">
- <widget class="KLineEdit">
- <property name="name">
- <cstring>testInput</cstring>
- </property>
- </widget>
-</widget>
-</UI>
-EOF
-
-
-
-kde_cv_uic_plugins=no
-kde_line="$UIC_PATH -L $kde_widgetdir"
-if test x$ac_uic_supports_nounload = xyes; then
- kde_line="$kde_line -nounload"
-fi
-kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-if AC_TRY_EVAL(kde_line); then
- # if you're trying to debug this check and think it's incorrect,
- # better check your installation. The check _is_ correct - your
- # installation is not.
- if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
- kde_cv_uic_plugins=yes
- fi
-fi
-rm -f actest.ui actest.cpp
-])
-
-AC_MSG_RESULT([$kde_cv_uic_plugins])
-if test "$kde_cv_uic_plugins" != yes; then
- AC_MSG_ERROR([
-you need to install tdelibs first.
-
-If you did install tdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile tdelibs.
-The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
-_same Qt version_, compiled with the _same compiler_ and the same Qt
-configuration settings.
-])
-fi
-fi
-])
-
-AC_DEFUN([KDE_CHECK_FINAL],
-[
- AC_ARG_ENABLE(final,
- AC_HELP_STRING([--enable-final],
- [build size optimized apps (experimental - needs lots of memory)]),
- kde_use_final=$enableval, kde_use_final=no)
-
- if test "x$kde_use_final" = "xyes"; then
- KDE_USE_FINAL_TRUE=""
- KDE_USE_FINAL_FALSE="#"
- else
- KDE_USE_FINAL_TRUE="#"
- KDE_USE_FINAL_FALSE=""
- fi
- AC_SUBST(KDE_USE_FINAL_TRUE)
- AC_SUBST(KDE_USE_FINAL_FALSE)
-])
-
-AC_DEFUN([KDE_CHECK_CLOSURE],
-[
- AC_ARG_ENABLE(closure,
- AC_HELP_STRING([--enable-closure],[delay template instantiation]),
- kde_use_closure=$enableval, kde_use_closure=no)
-
- KDE_NO_UNDEFINED=""
- if test "x$kde_use_closure" = "xyes"; then
- KDE_USE_CLOSURE_TRUE=""
- KDE_USE_CLOSURE_FALSE="#"
-# CXXFLAGS="$CXXFLAGS $REPO"
- else
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
- [KDE_NO_UNDEFINED=""])],
- [KDE_NO_UNDEFINED=""])
- ;;
- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
- AC_SUBST(KDE_NO_UNDEFINED)
-])
-
-dnl Check if the linker supports --enable-new-dtags and --as-needed
-AC_DEFUN([KDE_CHECK_NEW_LDFLAGS],
-[
- AC_ARG_ENABLE(new_ldflags,
- AC_HELP_STRING([--enable-new-ldflags],
- [enable the new linker flags]),
- kde_use_new_ldflags=$enableval,
- kde_use_new_ldflags=no)
-
- LDFLAGS_AS_NEEDED=""
- LDFLAGS_NEW_DTAGS=""
- if test "x$kde_use_new_ldflags" = "xyes"; then
- LDFLAGS_NEW_DTAGS=""
- KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
- [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
-
- KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
- [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
- fi
- AC_SUBST(LDFLAGS_AS_NEEDED)
- AC_SUBST(LDFLAGS_NEW_DTAGS)
-])
-
-AC_DEFUN([KDE_CHECK_NMCHECK],
-[
- AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
- kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
-
- if test "$kde_use_nmcheck" = "yes"; then
- KDE_USE_NMCHECK_TRUE=""
- KDE_USE_NMCHECK_FALSE="#"
- else
- KDE_USE_NMCHECK_TRUE="#"
- KDE_USE_NMCHECK_FALSE=""
- fi
- AC_SUBST(KDE_USE_NMCHECK_TRUE)
- AC_SUBST(KDE_USE_NMCHECK_FALSE)
-])
-
-AC_DEFUN([KDE_EXPAND_MAKEVAR], [
-savex=$exec_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-tmp=$$2
-while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
-exec_prefix=$savex
-])
-
-dnl ------------------------------------------------------------------------
-dnl Now, the same with KDE
-dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
-dnl and $(kde_includes) will be the kdehdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_BASE_PATH_KDE],
-[
-AC_REQUIRE([KDE_CHECK_STL])
-AC_REQUIRE([AC_PATH_TQT])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${prefix}" != NONE; then
- kde_includes=${includedir}
- KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
-
- kde_libraries=${libdir}
- KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
-
-else
- ac_kde_includes=
- ac_kde_libraries=
- kde_libraries=""
- kde_includes=""
-fi
-
-AC_CACHE_VAL(ac_cv_have_kde,
-[#try to guess kde locations
-
-if test "$kde_qtver" = 1; then
- kde_check_header="ksock.h"
- kde_check_lib="libtdecore.la"
-else
- kde_check_header="ksharedptr.h"
- kde_check_lib="libtdeio.la"
-fi
-
-if test -z "$1"; then
-
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $tqt_includes"
-test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
-kde_incdirs="$ac_kde_includes $kde_incdirs"
-AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-ac_kde_includes="$kde_incdir"
-
-if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
- AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
-test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-kde_widgetdir=NO
-dnl this might be somewhere else
-AC_FIND_FILE("trinity/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
-
-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/tdewidgets.la"; then
-AC_MSG_ERROR([
-I can't find the designer plugins. These are required and should have been installed
-by tdelibs])
-fi
-
-if test -n "$kde_widgetdir"; then
- kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
-fi
-
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
- ac_cv_have_kde="have_kde=no"
-else
- ac_cv_have_kde="have_kde=yes \
- ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-fi
-
-else dnl test -z $1, e.g. from tdelibs
-
- ac_cv_have_kde="have_kde=no"
-
-fi
-])dnl
-
-eval "$ac_cv_have_kde"
-
-if test "$have_kde" != "yes"; then
- if test "${prefix}" = NONE; then
- ac_kde_prefix="$ac_default_prefix"
- else
- ac_kde_prefix="$prefix"
- fi
- if test "$exec_prefix" = NONE; then
- ac_kde_exec_prefix="$ac_kde_prefix"
- AC_MSG_RESULT([will be installed in $ac_kde_prefix])
- else
- ac_kde_exec_prefix="$exec_prefix"
- AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
- fi
-
- kde_libraries="${libdir}"
- kde_includes="${includedir}"
-
-else
- ac_cv_have_kde="have_kde=yes \
- ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
- AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
-
- kde_libraries="$ac_kde_libraries"
- kde_includes="$ac_kde_includes"
-fi
-AC_SUBST(kde_libraries)
-AC_SUBST(kde_includes)
-
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$tqt_includes" || test "$kde_includes" = "/usr/include"; then
- KDE_INCLUDES=""
-else
- KDE_INCLUDES="-I$kde_includes"
- all_includes="$KDE_INCLUDES $all_includes"
-fi
-
-KDE_DEFAULT_CXXFLAGS="-DTQT_NO_ASCII_CAST -DTQT_NO_STL -DTQT_NO_COMPAT -DTQT_NO_TRANSLATION"
-
-KDE_LDFLAGS="-L$kde_libraries"
-if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
- all_libraries="$KDE_LDFLAGS $all_libraries"
-fi
-
-AC_SUBST(KDE_LDFLAGS)
-AC_SUBST(KDE_INCLUDES)
-
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-all_libraries="$all_libraries $USER_LDFLAGS"
-all_includes="$all_includes $USER_INCLUDES"
-AC_SUBST(all_includes)
-AC_SUBST(all_libraries)
-
-if test -z "$1"; then
-KDE_CHECK_UIC_PLUGINS
-fi
-
-ac_kde_libraries="$kde_libdir"
-
-AC_SUBST(AUTODIRS)
-
-
-])
-
-AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]),
- kde_use_extra_includes="$withval",
- kde_use_extra_includes=NONE
-)
-kde_extra_includes=
-if test -n "$kde_use_extra_includes" && \
- test "$kde_use_extra_includes" != "NONE"; then
-
- ac_save_ifs=$IFS
- IFS=':'
- for dir in $kde_use_extra_includes; do
- kde_extra_includes="$kde_extra_includes $dir"
- USER_INCLUDES="$USER_INCLUDES -I$dir"
- done
- IFS=$ac_save_ifs
- kde_use_extra_includes="added"
-else
- kde_use_extra_includes="no"
-fi
-AC_SUBST(USER_INCLUDES)
-
-AC_MSG_RESULT($kde_use_extra_includes)
-
-kde_extra_libs=
-AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]),
- kde_use_extra_libs=$withval,
- kde_use_extra_libs=NONE
-)
-if test -n "$kde_use_extra_libs" && \
- test "$kde_use_extra_libs" != "NONE"; then
-
- ac_save_ifs=$IFS
- IFS=':'
- for dir in $kde_use_extra_libs; do
- kde_extra_libs="$kde_extra_libs $dir"
- KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
- USER_LDFLAGS="$USER_LDFLAGS -L$dir"
- done
- IFS=$ac_save_ifs
- kde_use_extra_libs="added"
-else
- kde_use_extra_libs="no"
-fi
-
-AC_SUBST(USER_LDFLAGS)
-
-AC_MSG_RESULT($kde_use_extra_libs)
-
-])
-
-AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
-[
- AC_MSG_CHECKING([for KDE headers installed])
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include "confdefs.h"
-#include <kapp.h>
-
-int main() {
- printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
- printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
- printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
- printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
- printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
- printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
- printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
- printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
- printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
- printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
- printf("kde_wallpaperdir=\\"%s\\"\n",
- TDEApplication::kde_wallpaperdir().data());
- printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
- printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
- printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
- printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
- printf("kde_moduledir=\\"/tmp/dummy\\"\n");
- printf("kde_styledir=\\"/tmp/dummy\\"\n");
- printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
- printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
- printf("xdg_menudir=\\"/tmp/dummy\\"\n");
- printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
- printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
- return 0;
- }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$all_includes $CPPFLAGS"
- if AC_TRY_EVAL(ac_compile); then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_ERROR([your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log.])
- fi
- CPPFLAGS=$ac_save_CPPFLAGS
-
- AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_KDEQTADDON],
-[
-AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
-[
- kde_ldflags_safe="$LDFLAGS"
- kde_libs_safe="$LIBS"
- kde_cxxflags_safe="$CXXFLAGS"
-
- LIBS="-lkde-qt-addon $LIBTQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-
- AC_TRY_LINK([
- #include <qdom.h>
- ],
- [
- QDomDocument doc;
- ],
- kde_cv_have_kdetqtaddon=yes,
- kde_cv_have_kdetqtaddon=no
- )
-
- LDFLAGS=$kde_ldflags_safe
- LIBS=$kde_libs_safe
- CXXFLAGS=$kde_cxxflags_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
-
-if test "$kde_cv_have_kdetqtaddon" = "no"; then
- AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-It is a separate package (and CVS module) named kde-qt-addon.])
-fi
-])
-
-AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
-[
- AC_REQUIRE([KDE_MISC_TESTS])
- AC_REQUIRE([KDE_CHECK_LIBDL])
- AC_REQUIRE([K_PATH_X])
-
-if test $kde_qtver = 3; then
- case $host in
- *cygwin*) lib_kded="-ltdeinit_kded" ;;
- *) lib_kded="" ;;
- esac
- AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_TDECORE, "-ltdecore")
- AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_TDEIO, "-ltdeio")
- AC_SUBST(LIB_KJS, "-lkjs")
- AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_TDEABC, "-ltdeabc")
- AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_TDESPELL, "-ltdespell")
- AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
- AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
- AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
- AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
- AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
-# these are for backward compatibility
- AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
- AC_SUBST(LIB_TDEFILE, "-ltdeio")
-elif test $kde_qtver = 2; then
- AC_SUBST(LIB_TDECORE, "-ltdecore")
- AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_TDEIO, "-ltdeio")
- AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
- AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_TDEFILE, "-ltdefile")
- AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_TDESPELL, "-ltdespell")
- AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
- AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-else
- AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
- AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
- AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
- AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
-fi
-])
-
-AC_DEFUN([AC_PATH_KDE],
-[
- AC_BASE_PATH_KDE
- AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),
- [
- if test "$enableval" = "no";
- then ac_use_path_checking="default"
- else ac_use_path_checking=""
- fi
- ],
- [
- if test "$kde_qtver" = 1;
- then ac_use_path_checking=""
- else ac_use_path_checking="default"
- fi
- ]
- )
-
- AC_CREATE_KFSSTND($ac_use_path_checking)
-
- AC_SUBST_KFSSTND
- KDE_CREATE_LIBS_ALIASES
-])
-
-dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
-AC_DEFUN([KDE_CHECK_FUNC_EXT],
-[
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(kde_cv_func_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_COMPILE([
-$2
-],
-[
-$3
-],
-kde_cv_func_$1=yes,
-kde_cv_func_$1=no)
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$kde_safe_LIBS"
-AC_LANG_RESTORE
-])
-
-AC_MSG_RESULT($kde_cv_func_$1)
-
-AC_MSG_CHECKING([if $1 needs custom prototype])
-AC_CACHE_VAL(kde_cv_proto_$1,
-[
-if test "x$kde_cv_func_$1" = xyes; then
- kde_cv_proto_$1=no
-else
- case "$1" in
- setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
- kde_cv_proto_$1="yes - in libtdefakes"
- ;;
- *)
- kde_cv_proto_$1=unknown
- ;;
- esac
-fi
-
-if test "x$kde_cv_proto_$1" = xunknown; then
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
- kde_safe_libs=$LIBS
- LIBS="$LIBS $X_EXTRA_LIBS"
- AC_TRY_LINK([
-$2
-
-extern "C" $4;
-],
-[
-$3
-],
-[ kde_cv_func_$1=yes
- kde_cv_proto_$1=yes ],
- [kde_cv_proto_$1="$1 unavailable"]
-)
-LIBS=$kde_safe_libs
-AC_LANG_RESTORE
-fi
-])
-AC_MSG_RESULT($kde_cv_proto_$1)
-
-if test "x$kde_cv_func_$1" = xyes; then
- AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
- $6
-fi
-if test "x$kde_cv_proto_$1" = xno; then
- AC_DEFINE(HAVE_$5_PROTO, 1,
- [Define if you have the $1 prototype])
-fi
-
-AH_VERBATIM([_HAVE_$5_PROTO],
-[
-#if !defined(HAVE_$5_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-$4;
-#ifdef __cplusplus
-}
-#endif
-#endif
-])
-])
-
-AC_DEFUN([AC_CHECK_SETENV],
-[
- KDE_CHECK_FUNC_EXT(setenv, [
-#include <stdlib.h>
-],
- [setenv("VAR", "VALUE", 1);],
- [int setenv (const char *, const char *, int)],
- [SETENV])
-])
-
-AC_DEFUN([AC_CHECK_UNSETENV],
-[
- KDE_CHECK_FUNC_EXT(unsetenv, [
-#include <stdlib.h>
-],
- [unsetenv("VAR");],
- [void unsetenv (const char *)],
- [UNSETENV])
-])
-
-AC_DEFUN([AC_CHECK_GETDOMAINNAME],
-[
- KDE_CHECK_FUNC_EXT(getdomainname, [
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-],
- [
-char buffer[200];
-getdomainname(buffer, 200);
-],
- [#include <sys/types.h>
- int getdomainname (char *, size_t)],
- [GETDOMAINNAME])
-])
-
-AC_DEFUN([AC_CHECK_GETHOSTNAME],
-[
- KDE_CHECK_FUNC_EXT(gethostname, [
-#include <stdlib.h>
-#include <unistd.h>
-],
- [
-char buffer[200];
-gethostname(buffer, 200);
-],
- [int gethostname (char *, unsigned int)],
- [GETHOSTNAME])
-])
-
-AC_DEFUN([AC_CHECK_USLEEP],
-[
- KDE_CHECK_FUNC_EXT(usleep, [
-#include <unistd.h>
-],
- [
-usleep(200);
-],
- [int usleep (unsigned int)],
- [USLEEP])
-])
-
-
-AC_DEFUN([AC_CHECK_RANDOM],
-[
- KDE_CHECK_FUNC_EXT(random, [
-#include <stdlib.h>
-],
- [
-random();
-],
- [long int random(void)],
- [RANDOM])
-
- KDE_CHECK_FUNC_EXT(srandom, [
-#include <stdlib.h>
-],
- [
-srandom(27);
-],
- [void srandom(unsigned int)],
- [SRANDOM])
-
-])
-
-AC_DEFUN([AC_CHECK_INITGROUPS],
-[
- KDE_CHECK_FUNC_EXT(initgroups, [
-#include <sys/types.h>
-#include <unistd.h>
-#include <grp.h>
-],
- [
-char buffer[200];
-initgroups(buffer, 27);
-],
- [int initgroups(const char *, gid_t)],
- [INITGROUPS])
-])
-
-AC_DEFUN([AC_CHECK_MKSTEMPS],
-[
- KDE_CHECK_FUNC_EXT(mkstemps, [
-#include <stdlib.h>
-#include <unistd.h>
-],
- [
-mkstemps("/tmp/aaaXXXXXX", 6);
-],
- [int mkstemps(char *, int)],
- [MKSTEMPS])
-])
-
-AC_DEFUN([AC_CHECK_MKSTEMP],
-[
- KDE_CHECK_FUNC_EXT(mkstemp, [
-#include <stdlib.h>
-#include <unistd.h>
-],
- [
-mkstemp("/tmp/aaaXXXXXX");
-],
- [int mkstemp(char *)],
- [MKSTEMP])
-])
-
-AC_DEFUN([AC_CHECK_MKDTEMP],
-[
- KDE_CHECK_FUNC_EXT(mkdtemp, [
-#include <stdlib.h>
-#include <unistd.h>
-],
- [
-mkdtemp("/tmp/aaaXXXXXX");
-],
- [char *mkdtemp(char *)],
- [MKDTEMP])
-])
-
-
-AC_DEFUN([AC_CHECK_RES_INIT],
-[
- AC_MSG_CHECKING([if res_init needs -lresolv])
- kde_libs_safe="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
- AC_TRY_LINK(
- [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
- ],
- [
- res_init();
- ],
- [
- LIBRESOLV="-lresolv"
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
- ],
- [ AC_MSG_RESULT(no) ]
- )
- LIBS=$kde_libs_safe
- AC_SUBST(LIBRESOLV)
-
- KDE_CHECK_FUNC_EXT(res_init,
- [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
- ],
- [res_init()],
- [int res_init(void)],
- [RES_INIT])
-])
-
-AC_DEFUN([AC_CHECK_STRLCPY],
-[
- KDE_CHECK_FUNC_EXT(strlcpy, [
-#include <string.h>
-],
-[ char buf[20];
- strlcpy(buf, "KDE function test", sizeof(buf));
-],
- [unsigned long strlcpy(char*, const char*, unsigned long)],
- [STRLCPY])
-])
-
-AC_DEFUN([AC_CHECK_STRLCAT],
-[
- KDE_CHECK_FUNC_EXT(strlcat, [
-#include <string.h>
-],
-[ char buf[20];
- buf[0]='\0';
- strlcat(buf, "KDE function test", sizeof(buf));
-],
- [unsigned long strlcat(char*, const char*, unsigned long)],
- [STRLCAT])
-])
-
-AC_DEFUN([AC_CHECK_RES_QUERY],
-[
- KDE_CHECK_FUNC_EXT(res_query, [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <netdb.h>
-],
-[
-res_query(NULL, 0, 0, NULL, 0);
-],
- [int res_query(const char *, int, int, unsigned char *, int)],
- [RES_QUERY])
-])
-
-AC_DEFUN([AC_CHECK_DN_SKIPNAME],
-[
- KDE_CHECK_FUNC_EXT(dn_skipname, [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-],
-[
-dn_skipname (NULL, NULL);
-],
- [int dn_skipname (unsigned char *, unsigned char *)],
- [DN_SKIPNAME])
-])
-
-
-AC_DEFUN([AC_FIND_GIF],
- [AC_MSG_CHECKING([for giflib])
-AC_CACHE_VAL(ac_cv_lib_gif,
-[ac_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-else
-LIBS="$all_libraries -lgif"
-fi
-AC_TRY_LINK(dnl
-[
-#ifdef __cplusplus
-extern "C" {
-#endif
-int GifLastError(void);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-],
- [return GifLastError();],
- eval "ac_cv_lib_gif=yes",
- eval "ac_cv_lib_gif=no")
-LIBS="$ac_save_LIBS"
-])dnl
-if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
-else
- AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
-fi
-])
-
-AC_DEFUN([KDE_FIND_JPEG_HELPER],
-[
-AC_MSG_CHECKING([for libjpeg$2])
-AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-[
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[
-#ifdef __cplusplus
-extern "C" {
-#endif
-void jpeg_CreateDecompress();
-#ifdef __cplusplus
-}
-#endif
-],
-[jpeg_CreateDecompress();],
- eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
- eval "ac_cv_lib_jpeg_$1=no")
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-])
-
-if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
- LIBJPEG="$ac_cv_lib_jpeg_$1"
- AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
-else
- AC_MSG_RESULT(no)
- $3
-fi
-
-])
-
-AC_DEFUN([AC_FIND_JPEG],
-[
-dnl first look for libraries
-KDE_FIND_JPEG_HELPER(6b, 6b,
- KDE_FIND_JPEG_HELPER(normal, [],
- [
- LIBJPEG=
- ]
- )
-)
-
-dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
-dnl requires system dependent includes loaded before it)
-jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-test "x$jpeg_incdir" = xNO && jpeg_incdir=
-
-dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in tdehtml)
-dnl if only one is missing, it means a configuration error, but we still
-dnl only warn
-if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
- AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
-else
- if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
- AC_MSG_WARN([
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-])
- else
- AC_MSG_WARN([libjpeg not found. disable JPEG support.])
- fi
- jpeg_incdir=
- LIBJPEG=
-fi
-
-AC_SUBST(LIBJPEG)
-AH_VERBATIM(_AC_CHECK_JPEG,
-[/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-])
-])
-
-AC_DEFUN([KDE_CHECK_QT_JPEG],
-[
-if test -n "$LIBJPEG"; then
-AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-AC_CACHE_VAL(kde_cv_qt_jpeg,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBTQT"
-LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[#include <qapplication.h>],
- [
- int argc;
- char** argv;
- QApplication app(argc, argv);],
- eval "kde_cv_qt_jpeg=no",
- eval "kde_cv_qt_jpeg=yes")
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-fi
-])
-
-if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
- AC_MSG_RESULT(yes)
- LIBJPEG_QT='$(LIBJPEG)'
-else
- AC_MSG_RESULT(no)
- LIBJPEG_QT=
-fi
-
-])
-
-AC_DEFUN([AC_FIND_ZLIB],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#include<zlib.h>
-],
-[
- char buf[42];
- gzFile f = (gzFile) 0;
- /* this would segfault.. but we only link, don't run */
- (void) gzgets(f, buf, sizeof(buf));
-
- return (zlibVersion() == ZLIB_VERSION);
-],
- eval "ac_cv_lib_z='-lz'",
- eval "ac_cv_lib_z=no")
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if test ! "$ac_cv_lib_z" = no; then
- AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
- LIBZ="$ac_cv_lib_z"
- AC_MSG_RESULT($ac_cv_lib_z)
-else
- AC_MSG_ERROR(not found.
- Possibly configure picks up an outdated version
- installed by XFree86. Remove it from your system.
-
- Check your installation and look into config.log)
- LIBZ=""
-fi
-AC_SUBST(LIBZ)
-])
-
-AC_DEFUN([KDE_TRY_TIFFLIB],
-[
-AC_MSG_CHECKING([for libtiff $1])
-
-AC_CACHE_VAL(kde_cv_libtiff_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-else
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
-fi
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-[
-#include<tiffio.h>
-],
- [return (TIFFOpen( "", "r") == 0); ],
-[
- kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
-], [
- kde_cv_libtiff_$1=no
-])
-
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_libtiff_$1" = "no"; then
- AC_MSG_RESULT(no)
- LIBTIFF=""
- $3
-else
- LIBTIFF="$kde_cv_libtiff_$1"
- AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
- $2
-fi
-
-])
-
-AC_DEFUN([AC_FIND_TIFF],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-KDE_TRY_TIFFLIB(tiff, [],
- KDE_TRY_TIFFLIB(tiff34))
-
-AC_SUBST(LIBTIFF)
-])
-
-AC_DEFUN([KDE_FIND_LIBEXR],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_CACHE_VAL(ac_cv_libexr,
-[
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
- AC_MSG_CHECKING([for OpenEXR libraries])
-
- if test "$PKG_CONFIG" = "no" ; then
- AC_MSG_RESULT(no)
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
- AC_MSG_RESULT(no)
- EXRSTATUS=no
- else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
- AC_MSG_RESULT(no)
- EXRSTATUS=old
- else
- kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- kde_save_CXXFLAGS="$CXXFLAGS"
- EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
- CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
-
- AC_TRY_LINK(dnl
- [
- #include <ImfRgbaFile.h>
- ],
- [
- using namespace Imf;
- RgbaInputFile file ("dummy");
- return 0;
- ],
- eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
- eval "ac_cv_libexr=no"
- )
- LIBS="$kde_save_LIBS"
- CXXFLAGS="$kde_save_CXXFLAGS"
- AC_LANG_RESTORE
- ])dnl
- if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
- AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
- LIB_EXR="$ac_cv_libexr"
- AC_MSG_RESULT($ac_cv_libexr)
- else
- AC_MSG_RESULT(no)
- LIB_EXR=""
- fi
- fi
- fi
- fi
- AC_SUBST(LIB_EXR)
- AC_SUBST(EXR_FLAGS)
-])
-
-
-
-AC_DEFUN([AC_FIND_PNG],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_MSG_CHECKING([for libpng])
-AC_CACHE_VAL(ac_cv_lib_png,
-[
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-else
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-fi
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
- [
- #include<png.h>
- ],
- [
- png_structp png_ptr = png_create_read_struct( /* image ptr */
- PNG_LIBPNG_VER_STRING, 0, 0, 0 );
- return( png_ptr != 0 );
- ],
- eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
- eval "ac_cv_lib_png=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
- AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
- LIBPNG="$ac_cv_lib_png"
- AC_SUBST(LIBPNG)
- AC_MSG_RESULT($ac_cv_lib_png)
-else
- AC_MSG_RESULT(no)
- LIBPNG=""
- AC_SUBST(LIBPNG)
-fi
-])
-
-
-AC_DEFUN([AC_FIND_JASPER],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_MSG_CHECKING([for jasper])
-AC_CACHE_VAL(ac_cv_jasper,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
- [
- #include<jasper/jasper.h>
- ],
- [
- return( jas_init() );
- ],
- eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
- eval "ac_cv_jasper=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
- AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
- LIB_JASPER="$ac_cv_jasper"
- AC_MSG_RESULT($ac_cv_jasper)
-else
- AC_MSG_RESULT(no)
- LIB_JASPER=""
-fi
-AC_SUBST(LIB_JASPER)
-])
-
-AC_DEFUN([AC_CHECK_BOOL],
-[
- AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
-])
-
-AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
-[
-AC_MSG_CHECKING([whether $CXX supports -$1])
-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -$1"
- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
- CXXFLAGS="$save_CXXFLAGS"
- AC_LANG_RESTORE
-])
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT(yes)
- :
- $2
-else
- AC_MSG_RESULT(no)
- :
- $3
-fi
-])
-
-AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG],
-[
-AC_MSG_CHECKING([whether $CC supports -$1])
-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache,
-[
- AC_LANG_SAVE
- AC_LANG_C
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -$1"
- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], [])
- CFLAGS="$save_CFLAGS"
- AC_LANG_RESTORE
-])
-if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT(yes)
- :
- $2
-else
- AC_MSG_RESULT(no)
- :
- $3
-fi
-])
-
-
-dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
-dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
-dnl it's all white-space separated
-AC_DEFUN([AC_REMOVE_FORBIDDEN],
-[ __val=$$1
- __forbid=" $2 "
- if test -n "$__val"; then
- __new=""
- ac_save_IFS=$IFS
- IFS=" "
- for i in $__val; do
- case "$__forbid" in
- *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
- *) # Careful to not add spaces, where there were none, because otherwise
- # libtool gets confused, if we change e.g. CXX
- if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
- esac
- done
- IFS=$ac_save_IFS
- $1=$__new
- fi
-])
-
-
-AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
-[
- AC_MSG_CHECKING([whether $CC is blacklisted])
-
- dnl In theory we have tu run this test against $CC and $CXX
- dnl in C and in C++ mode, because its perfectly legal for
- dnl the user to mix compiler versions, since C has a defined
- dnl ABI.
- dnl
- dnl For now, we assume the user is not on crack.
-
- AC_TRY_COMPILE([
-#ifdef __GNUC__
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
-choke me
-#endif
-#endif
-], ,
- kde_bad_compiler=no,
- kde_bad_compiler=yes
-)
-
- AC_MSG_RESULT($kde_bad_compiler)
-
-if test "$kde_bad_compiler" = "yes"; then
- AC_MSG_ERROR([
-
-This particular compiler version is blacklisted because it
-is known to miscompile KDE. Please use a newer version, or
-if that is not yet available, choose an older version.
-
-Please do not report a bug or bother us reporting this
-configure error. We know about it, and we introduced
-it by intention to avoid untraceable bugs or crashes in KDE.
-
-])
-fi
-
-])
-
-
-AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
-[
- AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
- kde_cv_opt_noinline_match,
- [
- kde_cv_opt_noinline_match=irrelevant
- dnl if we don't use both -O2 and -fno-inline, this check is moot
- if echo "$CFLAGS" | grep -qe -O2 \
- && echo "$CFLAGS" | grep -qe -fno-inline ; then
-
- ac_cflags_save="$CFLAGS"
- CFLAGS="$CFLAGS -D_USE_GNU"
-
- AC_TRY_LINK([
- #include <string.h>
-], [ const char *pt, *et;
- et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ;
-],
- kde_cv_opt_noinline_match=yes,
- kde_cv_opt_noinline_match=no
- )
-
- CFLAGS="$ac_cflags_save"
- fi
- ])
-])
-
-
-dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
-[dnl
-if test "x$kde_use_qt_emb" != "xyes"; then
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-else
- AC_REMOVE_FORBIDDEN(CXX, [-rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
-fi
-])
-
-AC_DEFUN([AC_CHECK_COMPILERS],
-[
- AC_ARG_ENABLE(debug,
- AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
- [
- case $enableval in
- yes)
- kde_use_debug_code="yes"
- kde_use_debug_define=no
- ;;
- full)
- kde_use_debug_code="full"
- kde_use_debug_define=no
- ;;
- *)
- kde_use_debug_code="no"
- kde_use_debug_define=yes
- ;;
- esac
- ],
- [kde_use_debug_code="no"
- kde_use_debug_define=no
- ])
-
- dnl Just for configure --help
- AC_ARG_ENABLE(dummyoption,
- AC_HELP_STRING([--disable-debug],
- [disables debug output and debug symbols [default=no]]),
- [],[])
-
- AC_ARG_ENABLE(strict,
- AC_HELP_STRING([--enable-strict],
- [compiles with strict compiler options (may not work!)]),
- [
- if test $enableval = "no"; then
- kde_use_strict_options="no"
- else
- kde_use_strict_options="yes"
- fi
- ], [kde_use_strict_options="no"])
-
- AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]),
- [
- if test $enableval = "no"; then
- kde_use_warnings="no"
- else
- kde_use_warnings="yes"
- fi
- ], [kde_use_warnings="yes"])
-
- dnl enable warnings for debug build
- if test "$kde_use_debug_code" != "no"; then
- kde_use_warnings=yes
- fi
-
- AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]),
- [kde_use_profiling=$enableval],
- [kde_use_profiling="no"]
- )
-
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
- CFLAGS=" $CFLAGS"
-
- AC_PROG_CC
-
- AC_PROG_CPP
-
- if test "$GCC" = "yes"; then
- if test "$kde_use_debug_code" != "no"; then
- if test $kde_use_debug_code = "full"; then
- CFLAGS="-g3 -fno-inline $CFLAGS"
- else
- CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
- fi
- else
- CFLAGS="-O2 $CFLAGS"
- fi
- fi
-
- if test "$kde_use_debug_define" = "yes"; then
- CFLAGS="-DNDEBUG $CFLAGS"
- fi
-
-
- case "$host" in
- *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
- *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
- esac
-
- if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
- LDFLAGS=""
- fi
-
- CXXFLAGS=" $CXXFLAGS"
-
- AC_PROG_CXX
-
- KDE_CHECK_FOR_BAD_COMPILER
-
- if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
- if test "$kde_use_debug_code" != "no"; then
- if test "$CXX" = "KCC"; then
- CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
- else
- if test "$kde_use_debug_code" = "full"; then
- CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
- else
- CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
- fi
- fi
- KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
- dnl convenience compiler flags
- KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
- AC_SUBST(WOVERLOADED_VIRTUAL)
- else
- if test "$CXX" = "KCC"; then
- CXXFLAGS="+K3 $CXXFLAGS"
- else
- CXXFLAGS="-O2 $CXXFLAGS"
- fi
- fi
- fi
-
- if test "$kde_use_debug_define" = "yes"; then
- CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
- fi
-
- if test "$kde_use_profiling" = "yes"; then
- KDE_CHECK_COMPILER_FLAG(pg,
- [
- CFLAGS="-pg $CFLAGS"
- CXXFLAGS="-pg $CXXFLAGS"
- ])
- fi
-
- if test "$kde_use_warnings" = "yes"; then
- if test "$GCC" = "yes"; then
- CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
- case $host in
- *-*-linux-gnu)
- CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE $CFLAGS"
- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
- KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
- KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
- ;;
- esac
- KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
- KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
- dnl ### FIXME: revert for KDE 4
- KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
- fi
- fi
-
- if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
- CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
- fi
-
- AC_ARG_ENABLE(pch,
- AC_HELP_STRING([--enable-pch],
- [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]),
- [ kde_use_pch=$enableval ],[ kde_use_pch=no ])
-
- HAVE_GCC_VISIBILITY=0
- AC_SUBST([HAVE_GCC_VISIBILITY])
-
- if test "$GXX" = "yes"; then
- gcc_no_reorder_blocks=NO
- KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
- if test $kde_use_debug_code != "no" && \
- test $kde_use_debug_code != "full" && \
- test "YES" = "$gcc_no_reorder_blocks" ; then
- CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
- CFLAGS="$CFLAGS -fno-reorder-blocks"
- fi
- KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
- KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= )
- ENABLE_PERMISSIVE_FLAG="-fpermissive"
-
- if test "$kde_use_pch" = "yes"; then
- AC_MSG_CHECKING(whether gcc supports precompiling c header files)
- echo >conftest.h
- if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
- kde_gcc_supports_pch=yes
- AC_MSG_RESULT(yes)
- else
- kde_gcc_supports_pch=no
- AC_MSG_RESULT(no)
- fi
- if test "$kde_gcc_supports_pch" = "yes"; then
- AC_MSG_CHECKING(whether gcc supports precompiling c++ header files)
- if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
- kde_gcc_supports_pch=yes
- AC_MSG_RESULT(yes)
- else
- kde_gcc_supports_pch=no
- AC_MSG_RESULT(no)
- fi
- fi
- rm -f conftest.h conftest.h.gch
- fi
-
- KDE_CHECK_FOR_OPT_NOINLINE_MATCH
- if test "x$kde_cv_opt_noinline_match" = "xno" ; then
- CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
- fi
- fi
- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- if test "$CXX" = "KCC"; then
- dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
- dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
- dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= )
-
- if test "$kde_use_pch" = "yes"; then
- dnl TODO: support --pch-dir!
- KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
- dnl the below works (but the dir must exist), but it's
- dnl useless for a whole package.
- dnl The are precompiled headers for each source file, so when compiling
- dnl from scratch, it doesn't make a difference, and they take up
- dnl around ~5Mb _per_ sourcefile.
- dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp,
- dnl [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"])
- fi
- dnl this flag controls inlining. by default KCC inlines in optimisation mode
- dnl all implementations that are defined inside the class {} declaration.
- dnl because of templates-compatibility with broken gcc compilers, this
- dnl can cause excessive inlining. This flag limits it to a sane level
- KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"])
- KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"])
- KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"])
- KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"])
- dnl Some source files are shared between multiple executables
- dnl (or libraries) and some of those need template instantiations.
- dnl In that case KCC needs to compile those sources with
- dnl --one_instantiation_per_object. To make it easy for us we compile
- dnl _all_ objects with that flag (--one_per is a shorthand).
- KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"])
- fi
- AC_SUBST(USE_EXCEPTIONS)
- dnl obsolete macro - provided to keep things going
- USE_RTTI=
- AC_SUBST(USE_RTTI)
-
- case "$host" in
- *-*-irix*) test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
- *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
- *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
- *-*-solaris*)
- if test "$GXX" = yes; then
- libstdcpp=`$CXX -print-file-name=libstdc++.so`
- if test ! -f $libstdcpp; then
- AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so])
- fi
- fi
- ;;
- esac
-
- AC_VALIDIFY_CXXFLAGS
-
- AC_PROG_CXXCPP
-
- if test "$GCC" = yes; then
- NOOPT_CFLAGS=-O0
- fi
- KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
-
- AC_ARG_ENABLE(coverage,
- AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [
- if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
- ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
- ac_coverage_linker="-lgcc"
- elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then
- ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
- ac_coverage_linker=""
- else
- AC_MSG_ERROR([coverage with your compiler is not supported])
- fi
- CFLAGS="$CFLAGS $ac_coverage_compiler"
- CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
- LDFLAGS="$LDFLAGS $ac_coverage_linker"
- ])
-
- AC_SUBST(NOOPT_CXXFLAGS)
- AC_SUBST(NOOPT_CFLAGS)
- AC_SUBST(ENABLE_PERMISSIVE_FLAG)
-
- KDE_CHECK_NEW_LDFLAGS
- KDE_CHECK_FINAL
- KDE_CHECK_CLOSURE
- KDE_CHECK_NMCHECK
-
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-])
-
-AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
- [
- AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- safe_CXXFLAGS=$CXXFLAGS
- safe_LDFLAGS=$LDFLAGS
- CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
- LDFLAGS="$LDFLAGS -shared -fPIC"
-
- AC_TRY_LINK(
- [
- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
- #include <string>
- int some_function( void ) __attribute__ ((visibility("default")));
- int some_function( void )
- {
- std::string s("blafasel");
- return 0;
- }
- ], [/* elvis is alive */],
- kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-
- CXXFLAGS=$safe_CXXFLAGS
- LDFLAGS=$safe_LDFLAGS
- AC_LANG_RESTORE
- ]
- )
-
- if test x$kde_cv_val_gcc_visibility_bug = xno; then
- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
- fi
- ]
-)
-
-AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
-[
- AC_BEFORE([AC_PATH_TQT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-
- AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-
- if test "x$GXX" = "xyes"; then
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_EGREP_CPP(
- [GCC visibility push],
- [ #include <exception>
- ],
- [
- AC_MSG_RESULT(yes)
- kde_stdc_visibility_patched=yes ],
- [
- AC_MSG_RESULT(no)
- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
- visibility support. Disabling -fvisibility=hidden])
-
- kde_stdc_visibility_patched=no ])
-
- AC_LANG_RESTORE
-
- kde_have_gcc_visibility=no
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
- kde_have_gcc_visibility=yes
- dnl the whole toolchain is just a mess, gcc is just too buggy
- dnl to handle STL with visibility enabled. Lets reconsider
- dnl when gcc 4.2 is out or when things get fixed in the compiler.
- dnl Contact mueller@kde.org for details.
- AC_ARG_ENABLE(gcc-hidden-visibility,
- AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
- [kde_have_gcc_visibility=$enableval],
- [kde_have_gcc_visibility=no])
-
- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- safe_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $all_includes"
-
- AC_TRY_COMPILE(
- [
-#include <qglobal.h>
-#if Q_EXPORT - 0 != 0
-/* if this compiles, then Q_EXPORT is undefined */
-/* if Q_EXPORT is nonempty, this will break compilation */
-#endif
- ], [/* elvis is alive */],
- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-
- CXXFLAGS=$safe_CXXFLAGS
- AC_LANG_RESTORE
- ]
- )
-
- if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- KDE_CHECK_VISIBILITY_GCC_BUG
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- fi
- ])
- fi
-])
-
-AC_DEFUN([KDE_ADD_DEPENDENCIES],
-[
- [A]M_DEPENDENCIES(CC)
- [A]M_DEPENDENCIES(CXX)
-])
-
-dnl just a wrapper to clean up configure.in
-AC_DEFUN([KDE_PROG_LIBTOOL],
-[
-AC_REQUIRE([AC_CHECK_COMPILERS])
-AC_REQUIRE([AC_ENABLE_SHARED])
-AC_REQUIRE([AC_ENABLE_STATIC])
-
-AC_REQUIRE([AC_LIBTOOL_DLOPEN])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_OBJEXT
-AC_EXEEXT
-
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-# LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-AC_SUBST(KDE_PLUGIN)
-
-# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
-KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
-AC_SUBST(KDE_CHECK_PLUGIN)
-
-# we patch configure quite some so we better keep that consistent for incremental runs
-AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
-])
-
-AC_DEFUN([KDE_CHECK_LIB64],
-[
- tdelibsuff="$kde_libs_suffix"
- if test -z "$tdelibsuff"; then
- tdelibsuff="auto"
- fi
- AC_ARG_ENABLE(libsuffix,
- AC_HELP_STRING([--enable-libsuffix],
- [/lib directory suffix (64,32,none,auto[=default])]),
- tdelibsuff=$enableval)
-
- if test "$tdelibsuff" = "auto"; then
-
-cat > conftest.c << EOF
-#include <stdio.h>
-int main() {
- return 0;
-}
-EOF
- tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"`
- rm -rf conftest.*
- fi
-
- if test "$tdelibsuff" = "no"; then
- tdelibsuff=
- fi
- if test -z "$tdelibsuff"; then
- AC_MSG_RESULT([not using lib directory suffix])
- AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
- else
- if test "$libdir" = '${exec_prefix}/lib'; then
- libdir="$libdir${tdelibsuff}"
- AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
- fi
- AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
- AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
- fi
-])
-
-AC_DEFUN([KDE_CHECK_TYPES],
-[ AC_CHECK_SIZEOF(int, 4)dnl
- AC_CHECK_SIZEOF(short)dnl
- AC_CHECK_SIZEOF(long, 4)dnl
- AC_CHECK_SIZEOF(char *, 4)dnl
-])dnl
-
-dnl Not used - kept for compat only?
-AC_DEFUN([KDE_DO_IT_ALL],
-[
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE($1, $2)
-AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
-AC_CHECK_COMPILERS
-KDE_PROG_LIBTOOL
-AM_KDE_WITH_NLS
-AC_PATH_KDE
-])
-
-AC_DEFUN([AC_CHECK_RPATH],
-[
-AC_MSG_CHECKING(for rpath)
-AC_ARG_ENABLE(rpath,
- AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
- USE_RPATH=$enableval, USE_RPATH=yes)
-
-if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-
- KDE_RPATH="-R \$(libdir)"
-
- if test "$kde_libraries" != "$libdir"; then
- KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
- fi
-
- if test -n "$qt_libraries"; then
- KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
- fi
- dnl $x_libraries is set to /usr/lib in case
- if test -n "$X_LDFLAGS"; then
- X_RPATH="-R \$(x_libraries)"
- KDE_RPATH="$KDE_RPATH $X_RPATH"
- fi
- if test -n "$KDE_EXTRA_RPATH"; then
- KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
- fi
-fi
-AC_SUBST(KDE_EXTRA_RPATH)
-AC_SUBST(KDE_RPATH)
-AC_SUBST(X_RPATH)
-AC_MSG_RESULT($USE_RPATH)
-])
-
-dnl Check for the type of the third argument of getsockname
-AC_DEFUN([AC_CHECK_SOCKLEN_T],
-[
- AC_MSG_CHECKING(for socklen_t)
- AC_CACHE_VAL(kde_cv_socklen_t,
- [
- AC_LANG_PUSH(C++)
- kde_cv_socklen_t=no
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [
- socklen_t len;
- getpeername(0,0,&len);
- ],
- [
- kde_cv_socklen_t=yes
- kde_cv_socklen_t_equiv=socklen_t
- ])
- AC_LANG_POP(C++)
- ])
- AC_MSG_RESULT($kde_cv_socklen_t)
- if test $kde_cv_socklen_t = no; then
- AC_MSG_CHECKING([for socklen_t equivalent for socket functions])
- AC_CACHE_VAL(kde_cv_socklen_t_equiv,
- [
- kde_cv_socklen_t_equiv=int
- AC_LANG_PUSH(C++)
- for t in int size_t unsigned long "unsigned long"; do
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [
- $t len;
- getpeername(0,0,&len);
- ],
- [
- kde_cv_socklen_t_equiv="$t"
- break
- ])
- done
- AC_LANG_POP(C++)
- ])
- AC_MSG_RESULT($kde_cv_socklen_t_equiv)
- fi
- AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv,
- [type to use in place of socklen_t if not defined])
- AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv,
- [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)])
-])
-
-dnl This is a merge of some macros out of the gettext aclocal.m4
-dnl since we don't need anything, I took the things we need
-dnl the copyright for them is:
-dnl >
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-dnl >
-dnl for this file it is relicensed under LGPL
-
-AC_DEFUN([AM_KDE_WITH_NLS],
- [
- dnl If we use NLS figure out what method
-
- AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
- [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
- if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
- AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
- GMSGFMT=":"
- fi
- MSGFMT=$GMSGFMT
- AC_SUBST(GMSGFMT)
- AC_SUBST(MSGFMT)
-
- AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is no GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext programs is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
- AC_SUBST(XGETTEXT)
-
- ])
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# serial 1
-# Stephan Kulow: I appended a _KDE against name conflicts
-
-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-
-AC_DEFUN([AM_LC_MESSAGES],
- [if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES])
- fi
- fi])
-
-dnl From Jim Meyering.
-dnl FIXME: migrate into libit.
-
-AC_DEFUN([AM_FUNC_OBSTACK],
-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
- [AC_TRY_LINK([#include "obstack.h"],
- [struct obstack *mem;obstack_free(mem,(char *) 0)],
- am_cv_func_obstack=yes,
- am_cv_func_obstack=no)])
- if test $am_cv_func_obstack = yes; then
- AC_DEFINE(HAVE_OBSTACK)
- else
- LIBOBJS="$LIBOBJS obstack.o"
- fi
-])
-
-dnl From Jim Meyering. Use this if you use the GNU error.[ch].
-dnl FIXME: Migrate into libit
-
-AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
- am_cv_lib_error_at_line=yes,
- am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
- LIBOBJS="$LIBOBJS error.o"
- fi
- AC_SUBST(LIBOBJS)dnl
-])
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-# Stephan Kulow: I put a KDE in it to avoid name conflicts
-
-AC_DEFUN([AM_KDE_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_RANLIB])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_REQUIRE([AC_TYPE_OFF_T])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
- AC_REQUIRE([AC_FUNC_MMAP])dnl
- AC_REQUIRE([AM_KDE_WITH_NLS])dnl
- AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h])
- AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
- AC_MSG_CHECKING(for stpcpy)
- AC_CACHE_VAL(kde_cv_func_stpcpy,
- [
- kde_safe_cxxflags=$CXXFLAGS
- CXXFLAGS="-Werror"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([
- #include <string.h>
- ],
- [
- char buffer[200];
- stpcpy(buffer, buffer);
- ],
- kde_cv_func_stpcpy=yes,
- kde_cv_func_stpcpy=no)
- AC_LANG_RESTORE
- CXXFLAGS=$kde_safe_cxxflags
- ])
- AC_MSG_RESULT($kde_cv_func_stpcpy)
- if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
- AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
- fi
-
- AM_LC_MESSAGES
-
- if test "x$CATOBJEXT" != "x"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for lang in ${LINGUAS=$ALL_LINGUAS}; do
- case "$ALL_LINGUAS" in
- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
- esac
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- ])
-
-AC_DEFUN([AC_HAVE_XPM],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
- test -z "$XPM_INCLUDE" && XPM_INCLUDE=
-
- AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]),
- xpm_test=$withval, xpm_test="yes")
- if test "x$xpm_test" = xno; then
- ac_cv_have_xpm=no
- else
- AC_MSG_CHECKING(for XPM)
- AC_CACHE_VAL(ac_cv_have_xpm,
- [
- ac_save_ldflags="$LDFLAGS"
- ac_save_cflags="$CFLAGS"
- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
- else
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
- fi
- CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
- test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
- AC_TRY_LINK([#include <X11/xpm.h>],[],
- ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
- LDFLAGS="$ac_save_ldflags"
- CFLAGS="$ac_save_cflags"
- ])dnl
-
- if test "$ac_cv_have_xpm" = no; then
- AC_MSG_RESULT(no)
- XPM_LDFLAGS=""
- XPMINC=""
- $2
- else
- AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support])
- if test "$XPM_LDFLAGS" = ""; then
- XPMLIB='-lXpm $(LIB_X11)'
- else
- XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)'
- fi
- if test "$XPM_INCLUDE" = ""; then
- XPMINC=""
- else
- XPMINC="-I$XPM_INCLUDE"
- fi
- AC_MSG_RESULT(yes)
- $1
- fi
- fi
- AC_SUBST(XPMINC)
- AC_SUBST(XPMLIB)
-])
-
-AC_DEFUN([AC_HAVE_DPMS],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
- test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
- DPMS_LIB=
-
- AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]),
- dpms_test=$withval, dpms_test="yes")
- if test "x$dpms_test" = xno; then
- ac_cv_have_dpms=no
- else
- AC_MSG_CHECKING(for DPMS)
- dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms.
- dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
- AC_CACHE_VAL(ac_cv_have_dpms,
- [
- if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
- AC_MSG_RESULT(no)
- ac_cv_have_dpms="no"
- else
- ac_save_ldflags="$LDFLAGS"
- ac_save_cflags="$CFLAGS"
- ac_save_libs="$LIBS"
- LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
- LIBS="-lX11 -lXext $LIBSOCKET"
- CFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
- AC_TRY_LINK([
- #include <X11/Xproto.h>
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/extensions/dpms.h>
- int foo_test_dpms()
- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
- ac_cv_have_dpms="yes", [
- LIBS="-lXdpms $LIBS"
- AC_TRY_LINK([
- #include <X11/Xproto.h>
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/extensions/dpms.h>
- int foo_test_dpms()
- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
- [
- ac_cv_have_dpms="-lXdpms"
- ],ac_cv_have_dpms="no")
- ])
- LDFLAGS="$ac_save_ldflags"
- CFLAGS="$ac_save_cflags"
- LIBS="$ac_save_libs"
- fi
- ])dnl
-
- if test "$ac_cv_have_dpms" = no; then
- AC_MSG_RESULT(no)
- DPMS_LDFLAGS=""
- DPMSINC=""
- $2
- else
- AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support])
- if test "$ac_cv_have_dpms" = "-lXdpms"; then
- DPMS_LIB="-lXdpms"
- fi
- if test "$DPMS_LDFLAGS" = ""; then
- DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
- else
- DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
- fi
- if test "$DPMS_INCLUDE" = ""; then
- DPMSINC=""
- else
- DPMSINC="-I$DPMS_INCLUDE"
- fi
- AC_MSG_RESULT(yes)
- $1
- fi
- fi
- ac_save_cflags="$CFLAGS"
- CFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
- AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
- [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSCapable,
- AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
- [#include <X11/Xlib.h>
- #include <X11/extensions/dpms.h>])
- AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
- [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSInfo,
- AC_DEFINE(HAVE_DPMSINFO_PROTO),,
- [#include <X11/Xlib.h>
- #include <X11/extensions/dpms.h>])
- CFLAGS="$ac_save_cflags"
- AC_SUBST(DPMSINC)
- AC_SUBST(DPMSLIB)
-])
-
-AC_DEFUN([AC_HAVE_GL],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$GL_LDFLAGS" && GL_LDFLAGS=
- test -z "$GL_INCLUDE" && GL_INCLUDE=
-
- AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
- gl_test=$withval, gl_test="yes")
- if test "x$kde_use_qt_emb" = "xyes"; then
- # GL and Qt Embedded is a no-go for now.
- ac_cv_have_gl=no
- elif test "x$gl_test" = xno; then
- ac_cv_have_gl=no
- else
- AC_MSG_CHECKING(for GL)
- AC_CACHE_VAL(ac_cv_have_gl,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_save_ldflags=$LDFLAGS
- ac_save_cxxflags=$CXXFLAGS
- ac_save_libs=$LIBS
- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
- LIBS="$LIBS -lGL -lGLU"
- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
- LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
- CXXFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
- AC_TRY_LINK([#include <GL/gl.h>
-#include <GL/glu.h>
-], [],
- ac_cv_have_gl="yes", ac_cv_have_gl="no")
- AC_LANG_RESTORE
- LDFLAGS=$ac_save_ldflags
- CXXFLAGS=$ac_save_cxxflags
- LIBS=$ac_save_libs
- ])dnl
-
- if test "$ac_cv_have_gl" = "no"; then
- AC_MSG_RESULT(no)
- GL_LDFLAGS=""
- GLINC=""
- $2
- else
- AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
- if test "$GL_LDFLAGS" = ""; then
- GLLIB='-lGLU -lGL $(LIB_X11)'
- else
- GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
- fi
- if test "$GL_INCLUDE" = ""; then
- GLINC=""
- else
- GLINC="-I$GL_INCLUDE"
- fi
- AC_MSG_RESULT($ac_cv_have_gl)
- $1
- fi
- fi
- AC_SUBST(GLINC)
- AC_SUBST(GLLIB)
-])
-
-
- dnl shadow password and PAM magic - maintained by ossi@kde.org
-
-AC_DEFUN([KDE_PAM], [
- AC_REQUIRE([KDE_CHECK_LIBDL])
-
- want_pam=
- AC_ARG_WITH(pam,
- AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
- [ if test "x$withval" = "xyes"; then
- want_pam=yes
- pam_service=kde
- elif test "x$withval" = "xno"; then
- want_pam=no
- else
- want_pam=yes
- pam_service=$withval
- fi
- ], [ pam_service=kde ])
-
- use_pam=
- PAMLIBS=
- if test "x$want_pam" != xno; then
- AC_CHECK_LIB(pam, pam_start, [
- AC_CHECK_HEADER(security/pam_appl.h,
- [ pam_header=security/pam_appl.h ],
- [ AC_CHECK_HEADER(pam/pam_appl.h,
- [ pam_header=pam/pam_appl.h ],
- [
- AC_MSG_WARN([PAM detected, but no headers found!
-Make sure you have the necessary development packages installed.])
- ]
- )
- ]
- )
- ], , $LIBDL)
- if test -z "$pam_header"; then
- if test "x$want_pam" = xyes; then
- AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!])
- fi
- else
- AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
- PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
- use_pam=yes
-
- dnl darwin claims to be something special
- if test "$pam_header" = "pam/pam_appl.h"; then
- AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/])
- fi
-
- dnl test whether struct pam_message is const (Linux) or not (Sun)
- AC_MSG_CHECKING(for const pam_message)
- AC_EGREP_HEADER([struct pam_message], $pam_header,
- [ AC_EGREP_HEADER([const struct pam_message], $pam_header,
- [AC_MSG_RESULT([const: Linux-type PAM])],
- [AC_MSG_RESULT([nonconst: Sun-type PAM])
- AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])]
- )],
- [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
- fi
- fi
-
- AC_SUBST(PAMLIBS)
-])
-
-dnl DEF_PAM_SERVICE(arg name, full name, define name)
-AC_DEFUN([DEF_PAM_SERVICE], [
- AC_ARG_WITH($1-pam,
- AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]),
- [ if test "x$use_pam" = xyes; then
- $3_PAM_SERVICE=$withval
- else
- AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected.
-You may want to enforce it by using --with-pam.])
- fi
- ],
- [ if test "x$use_pam" = xyes; then
- $3_PAM_SERVICE="$pam_service"
- fi
- ])
- if test -n "$$3_PAM_SERVICE"; then
- AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
- AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
- fi
- AC_SUBST($3_PAM_SERVICE)
-])
-
-AC_DEFUN([KDE_SHADOWPASSWD], [
- AC_REQUIRE([KDE_PAM])
-
- AC_CHECK_LIB(shadow, getspent,
- [ LIBSHADOW="-lshadow"
- ac_use_shadow=yes
- ],
- [ dnl for UnixWare
- AC_CHECK_LIB(gen, getspent,
- [ LIBGEN="-lgen"
- ac_use_shadow=yes
- ],
- [ AC_CHECK_FUNC(getspent,
- [ ac_use_shadow=yes ],
- [ ac_use_shadow=no ])
- ])
- ])
- AC_SUBST(LIBSHADOW)
- AC_SUBST(LIBGEN)
-
- AC_MSG_CHECKING([for shadow passwords])
-
- AC_ARG_WITH(shadow,
- AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
- [ if test "x$withval" != "xno"; then
- use_shadow=yes
- else
- use_shadow=no
- fi
- ], [
- use_shadow="$ac_use_shadow"
- ])
-
- if test "x$use_shadow" = xyes; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords])
- else
- AC_MSG_RESULT(no)
- LIBSHADOW=
- LIBGEN=
- fi
-
- dnl finally make the relevant binaries setuid root, if we have shadow passwds.
- dnl this still applies, if we could use it indirectly through pam.
- if test "x$use_shadow" = xyes ||
- ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
- case $host in
- *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
- SETUIDFLAGS="-m 4755 -o root";;
- *)
- SETUIDFLAGS="-m 4755";;
- esac
- fi
- AC_SUBST(SETUIDFLAGS)
-
-])
-
-AC_DEFUN([KDE_PASSWDLIBS], [
- AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
- AC_REQUIRE([KDE_PAM])
- AC_REQUIRE([KDE_SHADOWPASSWD])
-
- if test "x$use_pam" = "xyes"; then
- PASSWDLIBS="$PAMLIBS"
- else
- PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
- fi
-
- dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but
- dnl /etc/master.passwd holds the actual passwords. /etc/master.passwd requires
- dnl root to read, so kcheckpass needs to be root (even when using pam, since pam
- dnl may need to read /etc/master.passwd).
- case $host in
- *-*-freebsd*)
- SETUIDFLAGS="-m 4755 -o root"
- ;;
- *)
- ;;
- esac
-
- AC_SUBST(PASSWDLIBS)
-])
-
-AC_DEFUN([KDE_CHECK_LIBDL],
-[
-AC_CHECK_LIB(dl, dlopen, [
-LIBDL="-ldl"
-ac_cv_have_dlfcn=yes
-])
-
-AC_CHECK_LIB(dld, shl_unload, [
-LIBDL="-ldld"
-ac_cv_have_shload=yes
-])
-
-AC_SUBST(LIBDL)
-])
-
-AC_DEFUN([KDE_CHECK_DLOPEN],
-[
-KDE_CHECK_LIBDL
-AC_CHECK_HEADERS(dlfcn.h dl.h)
-if test "$ac_cv_header_dlfcn_h" = "no"; then
- ac_cv_have_dlfcn=no
-fi
-
-if test "$ac_cv_header_dl_h" = "no"; then
- ac_cv_have_shload=no
-fi
-
-dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
-dnl (MM)
-AC_ARG_ENABLE(dlopen,
-AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
-enable_dlopen=$enableval,
-enable_dlopen=yes)
-
-# override the user's opinion, if we know it better ;)
-if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
- enable_dlopen=no
-fi
-
-if test "$ac_cv_have_dlfcn" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
-fi
-
-if test "$ac_cv_have_shload" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
-fi
-
-if test "$enable_dlopen" = no ; then
- test -n "$1" && eval $1
-else
- test -n "$2" && eval $2
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
-[
-KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
-KDE_PROG_LIBTOOL
-AC_MSG_CHECKING([dynamic loading])
-eval "`egrep '^build_libtool_libs=' libtool`"
-if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
- dynamic_loading=yes
- AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
-else
- dynamic_loading=no
-fi
-AC_MSG_RESULT($dynamic_loading)
-if test "$dynamic_loading" = "yes"; then
- $1
-else
- $2
-fi
-])
-
-AC_DEFUN([KDE_ADD_INCLUDES],
-[
-if test -z "$1"; then
- test_include="Pix.h"
-else
- test_include="$1"
-fi
-
-AC_MSG_CHECKING([for libg++ ($test_include)])
-
-AC_CACHE_VAL(kde_cv_libgpp_includes,
-[
-kde_cv_libgpp_includes=no
-
- for ac_dir in \
- \
- /usr/include/g++ \
- /usr/include \
- /usr/unsupported/include \
- /opt/include \
- $extra_include \
- ; \
- do
- if test -r "$ac_dir/$test_include"; then
- kde_cv_libgpp_includes=$ac_dir
- break
- fi
- done
-])
-
-AC_MSG_RESULT($kde_cv_libgpp_includes)
-if test "$kde_cv_libgpp_includes" != "no"; then
- all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES"
-fi
-])
-])
-
-AC_DEFUN([KDE_CHECK_LIBPTHREAD],
-[
- dnl This code is here specifically to handle the
- dnl various flavors of threading library on FreeBSD
- dnl 4-, 5-, and 6-, and the (weird) rules around it.
- dnl There may be an environment PTHREAD_LIBS that
- dnl specifies what to use; otherwise, search for it.
- dnl -pthread is special cased and unsets LIBPTHREAD
- dnl below if found.
- LIBPTHREAD=""
-
- if test -n "$PTHREAD_LIBS"; then
- if test "x$PTHREAD_LIBS" = "x-pthread" ; then
- LIBPTHREAD="PTHREAD"
- else
- PTHREAD_LIBS_save="$PTHREAD_LIBS"
- PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
- AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS])
- KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [
- LIBPTHREAD="$PTHREAD_LIBS_save"])
- PTHREAD_LIBS="$PTHREAD_LIBS_save"
- fi
- fi
-
- dnl Is this test really needed, in the face of the Tru64 test below?
- if test -z "$LIBPTHREAD"; then
- AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
- fi
-
- dnl This is a special Tru64 check, see BR 76171 issue #18.
- if test -z "$LIBPTHREAD" ; then
- AC_MSG_CHECKING([for pthread_create in -lpthread])
- kde_safe_libs=$LIBS
- LIBS="$LIBS -lpthread"
- AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
- AC_MSG_RESULT(yes)
- LIBPTHREAD="-lpthread"],[
- AC_MSG_RESULT(no)])
- LIBS=$kde_safe_libs
- fi
-
- dnl Un-special-case for FreeBSD.
- if test "x$LIBPTHREAD" = "xPTHREAD" ; then
- LIBPTHREAD=""
- fi
-
- AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
-[
- USE_THREADS=""
- if test -z "$LIBPTHREAD"; then
- KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
- fi
-
- AH_VERBATIM(__svr_define, [
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-])
- case $host_os in
- solaris*)
- KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
- CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
- ;;
- freebsd*)
- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
- ;;
- aix*)
- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
- LIBPTHREAD="$LIBPTHREAD -lc_r"
- ;;
- linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- if test "$CXX" = "KCC"; then
- CXXFLAGS="$CXXFLAGS --thread_safe"
- NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
- fi
- ;;
- *)
- ;;
- esac
- AC_SUBST(USE_THREADS)
- AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_THREADING],
-[
- AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
- AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
- dnl default is yes if libpthread is found and no if no libpthread is available
- if test -z "$LIBPTHREAD"; then
- if test -z "$USE_THREADS"; then
- kde_check_threading_default=no
- else
- kde_check_threading_default=yes
- fi
- else
- kde_check_threading_default=yes
- fi
- AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]),
- kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default)
- if test "x$kde_use_threading" = "xyes"; then
- AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
- fi
-])
-
-AC_DEFUN([KDE_TRY_LINK_PYTHON],
-[
-if test "$kde_python_link_found" = no; then
-
-if test "$1" = normal; then
- AC_MSG_CHECKING(if a Python application links)
-else
- AC_MSG_CHECKING(if Python depends on $2)
-fi
-
-AC_CACHE_VAL(kde_cv_try_link_python_$1,
-[
-kde_save_cflags="$CFLAGS"
-CFLAGS="$CFLAGS $PYTHONINC"
-kde_save_libs="$LIBS"
-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
-kde_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-AC_TRY_LINK(
-[
-#include <Python.h>
-],[
- PySys_SetArgv(1, 0);
-],
- [kde_cv_try_link_python_$1=yes],
- [kde_cv_try_link_python_$1=no]
-)
-CFLAGS="$kde_save_cflags"
-LIBS="$kde_save_libs"
-LDFLAGS="$kde_save_ldflags"
-])
-
-if test "$kde_cv_try_link_python_$1" = "yes"; then
- AC_MSG_RESULT(yes)
- kde_python_link_found=yes
- if test ! "$1" = normal; then
- LIBPYTHON="$LIBPYTHON $2"
- fi
- $3
-else
- AC_MSG_RESULT(no)
- $4
-fi
-
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_DIR],
-[
-AC_MSG_CHECKING([for Python directory])
-
-AC_CACHE_VAL(kde_cv_pythondir,
-[
- if test -z "$PYTHONDIR"; then
- kde_cv_pythondir=/usr/local
- else
- kde_cv_pythondir="$PYTHONDIR"
- fi
-])
-
-AC_ARG_WITH(pythondir,
-AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
-[
- ac_python_dir=$withval
-], ac_python_dir=$kde_cv_pythondir
-)
-
-AC_MSG_RESULT($ac_python_dir)
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
-
-if test -z "$1"; then
- version="1.5"
-else
- version="$1"
-fi
-
-AC_MSG_CHECKING([for Python$version])
-
-python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
-if test ! -r $python_incdir/Python.h; then
- AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir)
- python_incdir=$python_incdir/python$version
- if test ! -r $python_incdir/Python.h; then
- python_incdir=no
- fi
-fi
-
-PYTHONINC=-I$python_incdir
-
-python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
-AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-if test ! -r $python_libdir/libpython$version.so; then
- AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
- if test ! -r $python_libdir/libpython$version.a; then
- AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
- python_libdir=$python_libdir/python$version/config
- if test ! -r $python_libdir/libpython$version.a; then
- python_libdir=no
- fi
- fi
-fi
-
-PYTHONLIB=-L$python_libdir
-kde_orig_LIBPYTHON=$LIBPYTHON
-if test -z "$LIBPYTHON"; then
- LIBPYTHON=-lpython$version
-fi
-
-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-python_moddir=$python_moddir/python$version
-if test ! -r $python_moddir/copy.py; then
- python_moddir=no
-fi
-
-PYTHONMODDIR=$python_moddir
-
-AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir)
-
-if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
- LIBPYTHON=$kde_orig_LIBPYTHON
- test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
- test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
- $2
-else
- dnl Note: this test is very weak
- kde_python_link_found=no
- KDE_TRY_LINK_PYTHON(normal)
- KDE_TRY_LINK_PYTHON(m, -lm)
- KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
- KDE_TRY_LINK_PYTHON(tcl, -ltcl)
- KDE_TRY_LINK_PYTHON(db2, -ldb2)
- KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
- KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
- KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
- KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
- KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
- KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm])
- KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses])
- KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
- [AC_MSG_WARN([it seems, Python depends on another library.
- Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
- and contact the authors to let them know about this problem])
- ])
-
- LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
- AC_SUBST(PYTHONINC)
- AC_SUBST(PYTHONLIB)
- AC_SUBST(LIBPYTHON)
- AC_SUBST(PYTHONMODDIR)
- AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
-fi
-
-])
-
-
-AC_DEFUN([KDE_CHECK_PYTHON],
-[
- KDE_CHECK_PYTHON_INTERN("2.4",
- [KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
- [KDE_CHECK_PYTHON_INTERN("2.1",
- [KDE_CHECK_PYTHON_INTERN("2.0",
- [KDE_CHECK_PYTHON_INTERN($1, $2) ])
- ])
- ])
- ])
- ])
-])
-
-AC_DEFUN([KDE_CHECK_STL],
-[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-
- AC_MSG_CHECKING([if C++ programs can be compiled])
- AC_CACHE_VAL(kde_cv_stl_works,
- [
- AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
- string astring="Hallo Welt.";
- astring.erase(0, 6); // now astring is "Welt"
- return 0;
-], kde_cv_stl_works=yes,
- kde_cv_stl_works=no)
-])
-
- AC_MSG_RESULT($kde_cv_stl_works)
-
- if test "$kde_cv_stl_works" = "yes"; then
- # back compatible
- AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
- else
- AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
-Check config.log for details - if you're using a Linux distribution you might miss
-a package named similar to libstdc++-dev.])
- fi
-
- CXXFLAGS="$ac_save_CXXFLAGS"
- AC_LANG_RESTORE
-])
-
-AC_DEFUN([AC_FIND_QIMGIO],
- [AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for qimgio])
-AC_CACHE_VAL(ac_cv_lib_qimgio,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-ac_save_CXXFLAGS="$CXXFLAGS"
-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-AC_TRY_RUN(dnl
-[
-#include <qimageio.h>
-#include <qstring.h>
-int main() {
- QString t = "hallo";
- t.fill('t');
- qInitImageIO();
-}
-],
- ac_cv_lib_qimgio=yes,
- ac_cv_lib_qimgio=no,
- ac_cv_lib_qimgio=no)
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
- LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
- AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
- AC_SUBST(LIBQIMGIO)
-else
- AC_MSG_RESULT(not found)
-fi
-])
-
-AC_DEFUN([AM_DISABLE_LIBRARIES],
-[
- AC_PROVIDE([AM_ENABLE_STATIC])
- AC_PROVIDE([AM_ENABLE_SHARED])
- enable_static=no
- enable_shared=yes
-])
-
-
-AC_DEFUN([AC_CHECK_UTMP_FILE],
-[
- AC_MSG_CHECKING([for utmp file])
-
- AC_CACHE_VAL(kde_cv_utmp_file,
- [
- kde_cv_utmp_file=no
-
- for ac_file in \
- \
- /var/run/utmp \
- /var/adm/utmp \
- /etc/utmp \
- ; \
- do
- if test -r "$ac_file"; then
- kde_cv_utmp_file=$ac_file
- break
- fi
- done
- ])
-
- if test "$kde_cv_utmp_file" != "no"; then
- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
- $1
- AC_MSG_RESULT($kde_cv_utmp_file)
- else
- $2
- AC_MSG_RESULT([non found])
- fi
-])
-
-
-AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
-[
-
-DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-TOPSUBDIRS=""
-
-if test ! -s $srcdir/subdirs; then
- dnl Note: Makefile.common creates subdirs, so this is just a fallback
- files=`cd $srcdir && ls -1`
- dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
- for i in $dirs; do
- echo $i >> $srcdir/subdirs
- done
-fi
-
-ac_topsubdirs=
-if test -s $srcdir/inst-apps; then
- ac_topsubdirs="`cat $srcdir/inst-apps`"
-elif test -s $srcdir/subdirs; then
- ac_topsubdirs="`cat $srcdir/subdirs`"
-fi
-
-for i in $ac_topsubdirs; do
- AC_MSG_CHECKING([if $i should be compiled])
- if test -d $srcdir/$i; then
- install_it="yes"
- for j in $DO_NOT_COMPILE; do
- if test $i = $j; then
- install_it="no"
- fi
- done
- else
- install_it="no"
- fi
- AC_MSG_RESULT($install_it)
- vari=`echo $i | sed -e 's,[[-+.@]],_,g'`
- if test $install_it = "yes"; then
- TOPSUBDIRS="$TOPSUBDIRS $i"
- eval "$vari""_SUBDIR_included=yes"
- else
- eval "$vari""_SUBDIR_included=no"
- fi
-done
-
-AC_SUBST(TOPSUBDIRS)
-])
-
-AC_DEFUN([KDE_CHECK_NAMESPACES],
-[
-AC_MSG_CHECKING(whether C++ compiler supports namespaces)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
-],
-[
-namespace Foo {
- extern int i;
- namespace Bar {
- extern int i;
- }
-}
-
-int Foo::i = 0;
-int Foo::Bar::i = 1;
-],[
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_NAMESPACES)
-], [
-AC_MSG_RESULT(no)
-])
-AC_LANG_RESTORE
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_S_ISSOCK],
-[
-AC_MSG_CHECKING(for S_ISSOCK)
-AC_CACHE_VAL(ac_cv_have_s_issock,
-[
-AC_TRY_LINK(
-[
-#include <sys/stat.h>
-],
-[
-struct stat buff;
-int b = S_ISSOCK( buff.st_mode );
-],
-ac_cv_have_s_issock=yes,
-ac_cv_have_s_issock=no)
-])
-AC_MSG_RESULT($ac_cv_have_s_issock)
-if test "$ac_cv_have_s_issock" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
-fi
-
-AH_VERBATIM(_ISSOCK,
-[
-#ifndef HAVE_S_ISSOCK
-#define HAVE_S_ISSOCK
-#define S_ISSOCK(mode) (1==0)
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
-[
-AC_MSG_CHECKING(for MAXPATHLEN)
-AC_CACHE_VAL(ac_cv_maxpathlen,
-[
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include <sys/param.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-KDE_HELLO MAXPATHLEN
-
-EOF
-
-ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-
-if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
- ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-else
- ac_cv_maxpathlen=1024
-fi
-
-rm conftest.*
-
-])
-AC_MSG_RESULT($ac_cv_maxpathlen)
-AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
-])
-
-AC_DEFUN([KDE_CHECK_HEADER],
-[
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_CHECK_HEADER([$1], [$2], [$3], [$4])
- AC_LANG_RESTORE
- CPPFLAGS=$kde_safe_cppflags
-])
-
-AC_DEFUN([KDE_CHECK_HEADERS],
-[
- AH_CHECK_HEADERS([$1])
- AC_LANG_SAVE
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
- AC_LANG_CPLUSPLUS
- AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
- CPPFLAGS=$kde_safe_cppflags
- AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_FAST_CONFIGURE],
-[
- dnl makes configure fast (needs perl)
- AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]),
- with_fast_perl=$enableval, with_fast_perl=yes)
-])
-
-AC_DEFUN([KDE_CONF_FILES],
-[
- val=
- if test -f $srcdir/configure.files ; then
- val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
- fi
- CONF_FILES=
- if test -n "$val" ; then
- for i in $val ; do
- CONF_FILES="$CONF_FILES $i"
- done
- fi
- AC_SUBST(CONF_FILES)
-])dnl
-
-dnl This sets the prefix, for arts and tdelibs
-dnl Do NOT use in any other module.
-dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
-AC_DEFUN([KDE_SET_PREFIX_CORE],
-[
- unset CDPATH
- dnl make $TDEDIR the default for the installation
- AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
-
- if test "x$prefix" = "xNONE"; then
- prefix=$ac_default_prefix
- ac_configure_args="$ac_configure_args --prefix=$prefix"
- fi
- # And delete superfluous '/' to make compares easier
- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-
- kde_libs_prefix='$(prefix)'
- kde_libs_htmldir='$(kde_htmldir)'
- AC_SUBST(kde_libs_prefix)
- AC_SUBST(kde_libs_htmldir)
- KDE_FAST_CONFIGURE
- KDE_CONF_FILES
-])
-
-
-AC_DEFUN([KDE_SET_PREFIX],
-[
- unset CDPATH
- dnl We can't give real code to that macro, only a value.
- dnl It only matters for --help, since we set the prefix in this function anyway.
- AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
-
- KDE_SET_DEFAULT_BINDIRS
- if test "x$prefix" = "xNONE"; then
- dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
- KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
- else
- dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
- kde_save_PATH="$PATH"
- PATH="$exec_prefix/bin:$prefix/bin:$PATH"
- KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
- PATH="$kde_save_PATH"
- fi
-
- kde_libs_prefix=`$KDECONFIG --prefix`
- if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
- AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
- This means it has been moved since you installed it.
- This won't work. Please recompile tdelibs for the new prefix.
- ])
- fi
- kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix`
-
- AC_MSG_CHECKING([where to install])
- if test "x$prefix" = "xNONE"; then
- prefix=$kde_libs_prefix
- AC_MSG_RESULT([$prefix (as returned by tde-config)])
- else
- dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
- given_prefix=$prefix
- AC_MSG_RESULT([$prefix (as requested)])
- fi
-
- # And delete superfluous '/' to make compares easier
- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-
- AC_SUBST(KDECONFIG)
- AC_SUBST(kde_libs_prefix)
- AC_SUBST(kde_libs_htmldir)
-
- KDE_FAST_CONFIGURE
- KDE_CONF_FILES
-])
-
-pushdef([AC_PROG_INSTALL],
-[
- dnl our own version, testing for a -p flag
- popdef([AC_PROG_INSTALL])
- dnl as AC_PROG_INSTALL works as it works we first have
- dnl to save if the user didn't specify INSTALL, as the
- dnl autoconf one overwrites INSTALL and we have no chance to find
- dnl out afterwards
- test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
- test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
- test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
- AC_PROG_INSTALL
-
- if test -z "$kde_save_INSTALL_given" ; then
- # OK, user hasn't given any INSTALL, autoconf found one for us
- # now we test, if it supports the -p flag
- AC_MSG_CHECKING(for -p flag to install)
- rm -f confinst.$$.* > /dev/null 2>&1
- echo "Testtest" > confinst.$$.orig
- ac_res=no
- if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
- if test -f confinst.$$.new ; then
- # OK, -p seems to do no harm to install
- INSTALL="${INSTALL} -p"
- ac_res=yes
- fi
- fi
- rm -f confinst.$$.*
- AC_MSG_RESULT($ac_res)
- fi
- dnl the following tries to resolve some signs and wonders coming up
- dnl with different autoconf/automake versions
- dnl e.g.:
- dnl *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s
- dnl and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS)
- dnl it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s
- dnl *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has
- dnl INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the
- dnl install-@DIR@PROGRAMS targets to explicitly use that flag
- dnl *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
- dnl INSTALL_SCRIPT, which breaks with automake <= 1.4
- dnl *autoconf >2.13 (since 10.Apr 1999) has not that failure
- dnl *sometimes KDE does not use the install-@DIR@PROGRAM targets from
- dnl automake (due to broken Makefile.am or whatever) to install programs,
- dnl and so does not see the -s flag in automake > 1.4
- dnl to clean up that mess we:
- dnl +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG
- dnl which cleans KDE's program with automake > 1.4;
- dnl +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems
- dnl with automake<=1.4
- dnl note that dues to this sometimes two '-s' flags are used (if KDE
- dnl properly uses install-@DIR@PROGRAMS, but I don't care
- dnl
- dnl And to all this comes, that I even can't write in comments variable
- dnl names used by automake, because it is so stupid to think I wanted to
- dnl _use_ them, therefor I have written A_M_... instead of AM_
- dnl hmm, I wanted to say something ... ahh yes: Arghhh.
-
- if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
- INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
- fi
- if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
- INSTALL_SCRIPT='${INSTALL}'
- fi
-])dnl
-
-AC_DEFUN([KDE_LANG_CPLUSPLUS],
-[AC_LANG_CPLUSPLUS
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
-pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
-])
-
-pushdef([AC_LANG_CPLUSPLUS],
-[popdef([AC_LANG_CPLUSPLUS])
-KDE_LANG_CPLUSPLUS
-])
-
-AC_DEFUN([KDE_CHECK_LONG_LONG],
-[
-AC_MSG_CHECKING(for long long)
-AC_CACHE_VAL(kde_cv_c_long_long,
-[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_LINK([], [
- long long foo = 0;
- foo = foo+1;
- ],
- kde_cv_c_long_long=yes, kde_cv_c_long_long=no)
- AC_LANG_RESTORE
-])
-AC_MSG_RESULT($kde_cv_c_long_long)
-if test "$kde_cv_c_long_long" = yes; then
- AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_LIB],
-[
- kde_save_LDFLAGS="$LDFLAGS"
- dnl AC_CHECK_LIB modifies LIBS, so save it here
- kde_save_LIBS="$LIBS"
- LDFLAGS="$LDFLAGS $all_libraries"
- case $host_os in
- aix*) LDFLAGS="-brtl $LDFLAGS"
- test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
- ;;
- esac
- AC_CHECK_LIB($1, $2, $3, $4, $5)
- LDFLAGS="$kde_save_LDFLAGS"
- LIBS="$kde_save_LIBS"
-])
-
-AC_DEFUN([KDE_JAVA_PREFIX],
-[
- dir=`dirname "$1"`
- base=`basename "$1"`
- list=`ls -1 $dir 2> /dev/null`
- for entry in $list; do
- if test -d $dir/$entry/bin; then
- case $entry in
- $base)
- javadirs="$javadirs $dir/$entry/bin"
- ;;
- esac
- elif test -d $dir/$entry/jre/bin; then
- case $entry in
- $base)
- javadirs="$javadirs $dir/$entry/jre/bin"
- ;;
- esac
- fi
- done
-])
-
-dnl KDE_CHEC_JAVA_DIR(onlyjre)
-AC_DEFUN([KDE_CHECK_JAVA_DIR],
-[
-
-AC_ARG_WITH(java,
-AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]),
-[ ac_java_dir=$withval
-], ac_java_dir=""
-)
-
-AC_MSG_CHECKING([for Java])
-
-dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH
-if test "x$ac_java_dir" = "xno"; then
- kde_java_bindir=no
- kde_java_includedir=no
- kde_java_libjvmdir=no
- kde_java_libgcjdir=no
- kde_java_libhpidir=no
-else
- if test "x$ac_java_dir" = "x"; then
-
-
- dnl No option set -> collect list of candidate paths
- if test -n "$JAVA_HOME"; then
- KDE_JAVA_PREFIX($JAVA_HOME)
- fi
- KDE_JAVA_PREFIX(/usr/j2se)
- KDE_JAVA_PREFIX(/usr/lib/j2se)
- KDE_JAVA_PREFIX(/usr/j*dk*)
- KDE_JAVA_PREFIX(/usr/lib/j*dk*)
- KDE_JAVA_PREFIX(/opt/j*sdk*)
- KDE_JAVA_PREFIX(/usr/lib/java*)
- KDE_JAVA_PREFIX(/usr/java*)
- KDE_JAVA_PREFIX(/usr/java/j*dk*)
- KDE_JAVA_PREFIX(/usr/java/j*re*)
- KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
- KDE_JAVA_PREFIX(/usr/lib/SunJava*)
- KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
- KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
- KDE_JAVA_PREFIX(/opt/java*)
-
- kde_cv_path="NONE"
- kde_save_IFS=$IFS
- IFS=':'
- for dir in $PATH; do
- if test -d "$dir"; then
- javadirs="$javadirs $dir"
- fi
- done
- IFS=$kde_save_IFS
- jredirs=
-
- dnl Now javadirs contains a list of paths that exist, all ending with bin/
- for dir in $javadirs; do
- dnl Check for the java executable
- if test -x "$dir/java"; then
- dnl And also check for a libjvm.so somewhere under there
- dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
- if test "$dir" != "/usr/bin"; then
- libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
- if test ! -f $libjvmdir/libjvm.so; then continue; fi
- jredirs="$jredirs $dir"
- fi
- fi
- done
-
- dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found
- JAVAC=
- JAVA=
- kde_java_bindir=no
- for dir in $jredirs; do
- JAVA="$dir/java"
- kde_java_bindir=$dir
- if test -x "$dir/javac"; then
- JAVAC="$dir/javac"
- break
- fi
- done
-
- if test -n "$JAVAC"; then
- dnl this substitution might not work - well, we test for jni.h below
- kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
- else
- kde_java_includedir=no
- fi
- else
- dnl config option set
- kde_java_bindir=$ac_java_dir/bin
- if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
- kde_java_includedir=no
- else
- kde_java_includedir=$ac_java_dir/include
- fi
- fi
-fi
-
-dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
-if test "x$kde_java_bindir" != "xno"; then
-
- dnl Look for libjvm.so
- kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
- dnl Look for libgcj.so
- kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
- dnl Look for libhpi.so and avoid green threads
- kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-
- dnl Now check everything's fine under there
- dnl the include dir is our flag for having the JDK
- if test -d "$kde_java_includedir"; then
- if test ! -x "$kde_java_bindir/javac"; then
- AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
- fi
- if test ! -x "$kde_java_bindir/javah"; then
- AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
- fi
- if test ! -x "$kde_java_bindir/jar"; then
- AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
- fi
- if test ! -r "$kde_java_includedir/jni.h"; then
- AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.])
- fi
-
- jni_includes="-I$kde_java_includedir"
- dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
- dnl and under linux here..
-
- dnl not needed for gcj
-
- if test "x$kde_java_libgcjdir" = "x"; then
- test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
- test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
- test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
- fi
-
- else
- JAVAC=
- jni_includes=
- fi
-
- if test "x$kde_java_libgcjdir" = "x"; then
- if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
- AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
- fi
- else
- if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
- AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
- fi
- fi
-
- if test ! -x "$kde_java_bindir/java"; then
- AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
- fi
-
- dnl not needed for gcj compile
-
- if test "x$kde_java_libgcjdir" = "x"; then
- if test ! -r "$kde_java_libhpidir/libhpi.so"; then
- AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
- fi
- fi
-
- if test -n "$jni_includes"; then
- dnl Check for JNI version
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_cxxflags_safe="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
-
- AC_TRY_COMPILE([
- #include <jni.h>
- ],
- [
- #ifndef JNI_VERSION_1_2
- Syntax Error
- #endif
- ],[ kde_jni_works=yes ],
- [ kde_jni_works=no ])
-
- if test $kde_jni_works = no; then
- AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h.
- You need to have Java Development Kit (JDK) version 1.2.
-
- Use --with-java to specify another location.
- Use --without-java to configure without java support.
- Or download a newer JDK and try again.
- See e.g. http://java.sun.com/products/jdk/1.2 ])
- fi
-
- CXXFLAGS="$ac_cxxflags_safe"
- AC_LANG_RESTORE
-
- dnl All tests ok, inform and subst the variables
-
- JAVAC=$kde_java_bindir/javac
- JAVAH=$kde_java_bindir/javah
- JAR=$kde_java_bindir/jar
- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
- if test "x$kde_java_libgcjdir" = "x"; then
- JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
- else
- JVMLIBS="-L$kde_java_libgcjdir -lgcj"
- fi
- AC_MSG_RESULT([java JDK in $kde_java_bindir])
-
- else
- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
- AC_MSG_RESULT([java JRE in $kde_java_bindir])
- fi
-elif test -d "/Library/Java/Home"; then
- kde_java_bindir="/Library/Java/Home/bin"
- jni_includes="-I/Library/Java/Home/include"
-
- JAVAC=$kde_java_bindir/javac
- JAVAH=$kde_java_bindir/javah
- JAR=$kde_java_bindir/jar
- JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
-
- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
- AC_MSG_RESULT([Apple Java Framework])
-else
- AC_MSG_RESULT([none found])
-fi
-
-AC_SUBST(JAVAC)
-AC_SUBST(JAVAH)
-AC_SUBST(JAR)
-AC_SUBST(JVMLIBS)
-AC_SUBST(jni_includes)
-
-# for backward compat
-kde_cv_java_includedir=$kde_java_includedir
-kde_cv_java_bindir=$kde_java_bindir
-])
-
-dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
-dnl When the argument list becomes big, as in KDE for AC_OUTPUT in
-dnl big packages, m4_foreach is dog-slow. So use our own version of
-dnl it. (matz@kde.org)
-m4_define([mm_foreach],
-[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])])
-m4_define([mm_car], [[$1]])
-m4_define([mm_car2], [[$@]])
-m4_define([_mm_foreach],
-[m4_if(m4_quote($2), [], [],
- [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
- mm_car2(m4_shift($2)),
- [$3])])])
-m4_define([AC_FOREACH],
-[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
-
-AC_DEFUN([KDE_NEED_FLEX],
-[
-kde_libs_safe=$LIBS
-LIBS="$LIBS $USER_LDFLAGS"
-AM_PROG_LEX
-LIBS=$kde_libs_safe
-if test -z "$LEXLIB"; then
- AC_MSG_ERROR([You need to have flex installed.])
-fi
-AC_SUBST(LEXLIB)
-])
-
-AC_DEFUN([AC_PATH_TQTOPIA],
-[
- dnl TODO: use AC_CACHE_VAL
-
- if test -z "$1"; then
- qtopia_minver_maj=1
- qtopia_minver_min=5
- qtopia_minver_pat=0
- else
- qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
- qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
- qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
- fi
-
- qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
- qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
-
- AC_REQUIRE([AC_PATH_TQT])
-
- AC_MSG_CHECKING([for Qtopia])
-
- LIB_TQTOPIA="-lqpe"
- AC_SUBST(LIB_TQTOPIA)
-
- kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
-
- ac_qtopia_incdir=NO
-
- AC_ARG_WITH(qtopia-dir,
- AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
- [ ac_qtopia_incdir="$withval"/include] )
-
- qtopia_incdirs=""
- for dir in $kde_qtopia_dirs; do
- qtopia_incdirs="$qtopia_incdirs $dir/include"
- done
-
- if test ! "$ac_qtopia_incdir" = "NO"; then
- qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
- fi
-
- qtopia_incdir=""
- AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
- ac_qtopia_incdir="$qtopia_incdir"
-
- if test -z "$qtopia_incdir"; then
- AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
- fi
-
- qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
- qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
- qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
-
- qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
- qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
- if test "$qtopia_ver" -lt "$qtopia_minver"; then
- AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
-is required.])
- fi
-
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- ac_cxxflags_safe="$CXXFLAGS"
- ac_ldflags_safe="$LDFLAGS"
- ac_libs_safe="$LIBS"
-
- CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
- LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
- LIBS="$LIBS $LIB_TQTOPIA $LIBTQT"
-
- cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qpe/qpeapplication.h>
-#include <qpe/version.h>
-
-int main( int argc, char **argv )
-{
- QPEApplication app( argc, argv );
- return 0;
-}
-EOF
-
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
- rm -f conftest*
- else
- rm -f conftest*
- AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
-the end of config.log])
- fi
-
- CXXFLAGS="$ac_cxxflags_safe"
- LDFLAGS="$ac_ldflags_safe"
- LIBS="$ac_libs_safe"
-
- AC_LANG_RESTORE
-
- QTOPIA_INCLUDES="-I$qtopia_incdir"
- AC_SUBST(QTOPIA_INCLUDES)
-
- AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
-])
-
-
-AC_DEFUN([KDE_INIT_DOXYGEN],
-[
-AC_MSG_CHECKING([for Qt docs])
-kde_qtdir=
-if test "${with_qt_dir+set}" = set; then
- kde_qtdir="$with_qt_dir"
-fi
-
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], TQTDOCDIR)
-AC_MSG_RESULT($TQTDOCDIR)
-
-AC_SUBST(TQTDOCDIR)
-
-KDE_FIND_PATH(dot, DOT, [], [])
-if test -n "$DOT"; then
- KDE_HAVE_DOT="YES"
-else
- KDE_HAVE_DOT="NO"
-fi
-AC_SUBST(KDE_HAVE_DOT)
-KDE_FIND_PATH(doxygen, DOXYGEN, [], [])
-AC_SUBST(DOXYGEN)
-
-DOXYGEN_PROJECT_NAME="$1"
-DOXYGEN_PROJECT_NUMBER="$2"
-AC_SUBST(DOXYGEN_PROJECT_NAME)
-AC_SUBST(DOXYGEN_PROJECT_NUMBER)
-
-KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then
- KDE_HAS_DOXYGEN=yes
-fi
-AC_SUBST(KDE_HAS_DOXYGEN)
-
-])
-
-
-AC_DEFUN([AC_FIND_BZIP2],
-[
-AC_MSG_CHECKING([for bzDecompress in libbz2])
-AC_CACHE_VAL(ac_cv_lib_bzip2,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#define BZ_NO_STDIO
-#include<bzlib.h>
-],
- [ bz_stream s; (void) bzDecompress(&s); ],
- eval "ac_cv_lib_bzip2='-lbz2'",
- eval "ac_cv_lib_bzip2=no")
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-AC_MSG_RESULT($ac_cv_lib_bzip2)
-
-if test ! "$ac_cv_lib_bzip2" = no; then
- BZIP2DIR=bzip2
-
- LIBBZ2="$ac_cv_lib_bzip2"
- AC_SUBST(LIBBZ2)
-
-else
-
- cxx_shared_flag=
- ld_shared_flag=
- KDE_CHECK_COMPILER_FLAG(shared, [
- ld_shared_flag="-shared"
- ])
- KDE_CHECK_COMPILER_FLAG(fPIC, [
- cxx_shared_flag="-fPIC"
- ])
-
- AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2])
- AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- kde_save_LIBS="$LIBS"
- LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
- kde_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-
- AC_TRY_LINK(dnl
- [
- #define BZ_NO_STDIO
- #include<bzlib.h>
- ],
- [ bz_stream s; (void) BZ2_bzDecompress(&s); ],
- eval "ac_cv_lib_bzip2_prefix='-lbz2'",
- eval "ac_cv_lib_bzip2_prefix=no")
- LIBS="$kde_save_LIBS"
- CXXFLAGS="$kde_save_CXXFLAGS"
- AC_LANG_RESTORE
- ])dnl
-
- AC_MSG_RESULT($ac_cv_lib_bzip2_prefix)
-
- if test ! "$ac_cv_lib_bzip2_prefix" = no; then
- BZIP2DIR=bzip2
-
- LIBBZ2="$ac_cv_lib_bzip2_prefix"
- AC_SUBST(LIBBZ2)
-
- AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix])
- dnl else, we just ignore this
- fi
-
-fi
-AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the SSL headers and libraries.
-dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed)
-dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([KDE_CHECK_SSL],
-[
-LIBSSL="-lssl -lcrypto"
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-ac_ssl_includes=NO ac_ssl_libraries=NO
-ssl_libraries=""
-ssl_includes=""
-AC_ARG_WITH(ssl-dir,
- AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
- [ ac_ssl_includes="$withval"/include
- ac_ssl_libraries="$withval"/lib$tdelibsuff
- ])
-
-want_ssl=yes
-AC_ARG_WITH(ssl,
- AC_HELP_STRING([--without-ssl],[disable SSL checks]),
- [want_ssl=$withval])
-
-if test $want_ssl = yes; then
-
-AC_MSG_CHECKING(for OpenSSL)
-
-AC_CACHE_VAL(ac_cv_have_ssl,
-[#try to guess OpenSSL locations
-
- ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
- ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
- AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
- ac_ssl_includes="$ssl_incdir"
-
- ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
- if test ! "$ac_ssl_libraries" = "NO"; then
- ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
- fi
-
- test=NONE
- ssl_libdir=NONE
- for dir in $ssl_libdirs; do
- try="ls -1 $dir/libssl*"
- if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
- done
-
- ac_ssl_libraries="$ssl_libdir"
-
- ac_ldflags_safe="$LDFLAGS"
- ac_libs_safe="$LIBS"
-
- LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
- LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-
- AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();,
- ac_ssl_rsaref="yes"
- ,
- ac_ssl_rsaref="no"
- )
-
- LDFLAGS="$ac_ldflags_safe"
- LIBS="$ac_libs_safe"
-
- if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
- have_ssl=no
- else
- have_ssl=yes;
- fi
-
- ])
-
- eval "$ac_cv_have_ssl"
-
- AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes])
-
- AC_MSG_CHECKING([whether OpenSSL uses rsaref])
- AC_MSG_RESULT($ac_ssl_rsaref)
-
- AC_MSG_CHECKING([for easter eggs])
- AC_MSG_RESULT([none found])
-
-else
- have_ssl=no
-fi
-
-if test "$have_ssl" = yes; then
- AC_MSG_CHECKING(for OpenSSL version)
- dnl Check for SSL version
- AC_CACHE_VAL(ac_cv_ssl_version,
- [
-
- cat >conftest.$ac_ext <<EOF
-#include <openssl/opensslv.h>
-#include <stdio.h>
- int main() {
-
-#ifndef OPENSSL_VERSION_NUMBER
- printf("ssl_version=\\"error\\"\n");
-#else
- if (OPENSSL_VERSION_NUMBER < 0x00906000)
- printf("ssl_version=\\"old\\"\n");
- else
- printf("ssl_version=\\"ok\\"\n");
-#endif
- return (0);
- }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- if test "$ac_ssl_includes" != "/usr/include"; then
- CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
- fi
-
- if AC_TRY_EVAL(ac_link); then
-
- if eval `./conftest 2>&5`; then
- if test $ssl_version = error; then
- AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !])
- else
- if test $ssl_version = old; then
- AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.])
- have_ssl=no
- fi
- fi
- ac_cv_ssl_version="ssl_version=$ssl_version"
- else
- AC_MSG_ERROR([Your system couldn't run a small SSL test program.
- Check config.log, and if you can't figure it out, send a mail to
- David Faure <faure@kde.org>, attaching your config.log])
- fi
-
- else
- AC_MSG_ERROR([Your system couldn't link a small SSL test program.
- Check config.log, and if you can't figure it out, send a mail to
- David Faure <faure@kde.org>, attaching your config.log])
- fi
- CPPFLAGS=$ac_save_CPPFLAGS
-
- ])
-
- eval "$ac_cv_ssl_version"
- AC_MSG_RESULT($ssl_version)
-fi
-
-if test "$have_ssl" != yes; then
- LIBSSL="";
-else
- AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL])
- ac_cv_have_ssl="have_ssl=yes \
- ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-
-
- ssl_libraries="$ac_ssl_libraries"
- ssl_includes="$ac_ssl_includes"
-
- if test "$ac_ssl_rsaref" = yes; then
- LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref"
- fi
-
- if test $ssl_version = "old"; then
- AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6])
- fi
-fi
-
-SSL_INCLUDES=
-
-if test "$ssl_includes" = "/usr/include"; then
- if test -f /usr/kerberos/include/krb5.h; then
- SSL_INCLUDES="-I/usr/kerberos/include"
- fi
-elif test "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
- SSL_INCLUDES="-I$ssl_includes"
-fi
-
-if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
- SSL_LDFLAGS=""
-else
- SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-fi
-
-AC_SUBST(SSL_INCLUDES)
-AC_SUBST(SSL_LDFLAGS)
-AC_SUBST(LIBSSL)
-])
-
-AC_DEFUN([KDE_CHECK_STRLCPY],
-[
- AC_REQUIRE([AC_CHECK_STRLCAT])
- AC_REQUIRE([AC_CHECK_STRLCPY])
- AC_CHECK_SIZEOF(size_t)
- AC_CHECK_SIZEOF(unsigned long)
-
- AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long])
- AC_TRY_COMPILE(,[
- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
- choke me
- #endif
- ],AC_MSG_RESULT([yes]),[
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
- Apparently on your system our assumption sizeof size_t == sizeof unsigned long
- does not apply. Please mail kde-devel@kde.org with a description of your system!
- ])
- ])
-])
-
-AC_DEFUN([KDE_CHECK_BINUTILS],
-[
- AC_MSG_CHECKING([if ld supports unversioned version maps])
-
- kde_save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
- echo "{ local: extern \"C++\" { foo }; };" > conftest.map
- AC_TRY_LINK([int foo;],
-[
-#ifdef __INTEL_COMPILER
-icc apparently does not support libtools version-info and version-script
-at the same time. Dunno where the bug is, but until somebody figured out,
-better disable the optional version scripts.
-#endif
-
- foo = 42;
-], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
- LDFLAGS="$kde_save_LDFLAGS"
- rm -f conftest.map
- AM_CONDITIONAL(include_VERSION_SCRIPT,
- [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"])
-
- AC_MSG_RESULT($kde_supports_versionmaps)
-])
-
-AC_DEFUN([AM_PROG_OBJC],[
-AC_CHECK_PROGS(OBJC, gcc, gcc)
-test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH])
-if test "x${OBJCFLAGS-unset}" = xunset; then
- OBJCFLAGS="-g -O2"
-fi
-AC_SUBST(OBJCFLAGS)
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
-])
-
-AC_DEFUN([KDE_CHECK_PERL],
-[
- KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
- AC_MSG_ERROR([No Perl found in your $PATH.
-We need perl to generate some code.])
- ])
- AC_SUBST(PERL)
-])
-
-AC_DEFUN([KDE_CHECK_LARGEFILE],
-[
-AC_SYS_LARGEFILE
-if test "$ac_cv_sys_file_offset_bits" != no; then
- CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-fi
-
-if test "x$ac_cv_sys_large_files" != "xno"; then
- CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
-fi
-
-])
-
-dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in)
-dnl which allows to search for libs that get installed into the KDE prefix.
-dnl
-dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not)
-dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
-dnl also defines KSTUFF_PKG_ERRORS on error
-AC_DEFUN([KDE_PKG_CHECK_MODULES], [
-
- PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
- if test "$prefix" != "$kde_libs_prefix"; then
- PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
- fi
- export PKG_CONFIG_PATH
- PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
-])
-
-
-dnl Check for PIE support in the compiler and linker
-AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
-[
- AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- safe_CXXFLAGS=$CXXFLAGS
- safe_LDFLAGS=$LDFLAGS
- CXXFLAGS="$CXXFLAGS -fpie"
- LDFLAGS="$LDFLAGS -pie"
-
- AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
-
- CXXFLAGS=$safe_CXXFLAGS
- LDFLAGS=$safe_LDFLAGS
- AC_LANG_RESTORE
- ])
-
- AC_MSG_CHECKING(if enabling -pie/fpie support)
-
- AC_ARG_ENABLE(pie,
- AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
- [kde_has_pie_support=$enableval],
- [kde_has_pie_support=detect])
-
- if test "$kde_has_pie_support" = "detect"; then
- kde_has_pie_support=$kde_cv_val_pie_support
- fi
-
- AC_MSG_RESULT([$kde_has_pie_support])
-
- KDE_USE_FPIE=""
- KDE_USE_PIE=""
-
- AC_SUBST([KDE_USE_FPIE])
- AC_SUBST([KDE_USE_PIE])
-
- if test "$kde_has_pie_support" = "yes"; then
- KDE_USE_FPIE="-fpie"
- KDE_USE_PIE="-pie"
- fi
-])
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-## Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-# serial 47 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
- [],
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [AC_LIBTOOL_CXX],
- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- ])])
-dnl And a similar setup for Fortran 77 support
- AC_PROVIDE_IFELSE([AC_PROG_F77],
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [ifdef([AC_PROG_GCJ],
- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([A][M_PROG_GCJ],
- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-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
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
- ;;
- *)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- AC_PATH_MAGIC
- fi
- ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
- [AC_HELP_STRING([--with-pic],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
- [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
- # Yippee, $echo works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-[$]*
-EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
- echo_test_string="`eval $cmd`" &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
- fi
- done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
-else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- echo='print -r'
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- echo='printf %s\n'
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- echo=echo
- fi
- fi
- fi
- fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && 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.
- 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"
- ;;
- *ELF-64*)
- HPUX_IA64_MODE="64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -melf32bsmip"
- ;;
- *N32*)
- LD="${LD-ld} -melf32bmipn32"
- ;;
- *64-bit*)
- LD="${LD-ld} -melf64bmip"
- ;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
- *32-bit*)
- LINUX_64_MODE="32"
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
- ppc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- LINUX_64_MODE="64"
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- ppc*-*linux*|powerpc*-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- 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_TRY_LINK([],[],[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
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
- ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
- $2=yes
- fi
- fi
- $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$5], , :, [$5])
-else
- ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
- else
- $2=yes
- fi
- fi
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$4], , :, [$4])
-else
- ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
- testring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- testring=$testring$testring
- done
- testring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- ;;
- esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
- AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# --------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
- [$4]
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-
- exit (status);
-}]
-EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_unknown|x*) $3 ;;
- esac
- else :
- # compilation failed
- $3
- fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ])
- ;;
-
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
- ])
- ])
- ])
- ])
- ])
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- AC_CACHE_CHECK([whether a program can dlopen itself],
- lt_cv_dlopen_self, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
- lt_cv_dlopen_self_static, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
- # that will create temporary files in the current directory regardless of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to do parallel
- # builds.
- chmod -w .
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s out/conftest.err; then
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- fi
- fi
- chmod u+w .
- $rm conftest* out/*
- rmdir out
- cd ..
- rmdir conftest
- $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; 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
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- 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])
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
- # Linking always hardcodes the temporary library directory.
- _LT_AC_TAGVAR(hardcode_action, $1)=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-fi
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- version_type=linux
- 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'
- ;;
-
-aix4* | aix5*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- 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
- # 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
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not 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
- # 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
- # 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
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi4*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- 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'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
-
- 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}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- 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}'
- ;;
- esac
- ;;
-
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${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='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-freebsd1*)
- dynamic_linker=no
- ;;
-
-kfreebsd*-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- 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}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- *) # from 3.2 on
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- esac
- ;;
-
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case "$host_cpu" in
- ia64*)
- shrext='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
- if test -d /lib64; then
- libsuff=64
- fi
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-openbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
- AC_MSG_WARN([output file `$ofile' does not exist])
- fi
-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
- AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
- else
- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
- fi
- fi
-
- # Extract list of available tagged configurations in $ofile.
- # Note that this assumes the entire list is on one line.
- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for tagname in $tagnames; do
- IFS="$lt_save_ifs"
- # Check whether tagname contains only valid characters
- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
- "") ;;
- *) AC_MSG_ERROR([invalid tag name: $tagname])
- ;;
- esac
-
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
- then
- AC_MSG_ERROR([tag name \"$tagname\" already exists])
- fi
-
- # Update the list of available tags.
- if test -n "$tagname"; then
- echo appending configuration tag \"$tagname\" to $ofile
-
- case $tagname in
- CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
- AC_LIBTOOL_LANG_CXX_CONFIG
- else
- tagname=""
- fi
- ;;
-
- F77)
- if test -n "$F77" && test "X$F77" != "Xno"; then
- AC_LIBTOOL_LANG_F77_CONFIG
- else
- tagname=""
- fi
- ;;
-
- GCJ)
- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- AC_LIBTOOL_LANG_GCJ_CONFIG
- else
- tagname=""
- fi
- ;;
-
- RC)
- AC_LIBTOOL_LANG_RC_CONFIG
- ;;
-
- *)
- AC_MSG_ERROR([Unsupported tag name: $tagname])
- ;;
- esac
-
- # Append the new tag name to the list of available tags.
- if test -n "$tagname" ; then
- available_tags="$available_tags $tagname"
- fi
- fi
- done
- IFS="$lt_save_ifs"
-
- # Now substitute the updated list of available tags.
- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
- mv "${ofile}T" "$ofile"
- chmod +x "$ofile"
- else
- rm -f "${ofile}T"
- AC_MSG_ERROR([unable to update list of available tagged configurations.])
- fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_shared=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-#- set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- 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,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_fast_install=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
- fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_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_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="ifelse([$2], , $PATH, [$2])"
- for ac_dir in $ac_dummy; do
- 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 -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"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- AC_MSG_RESULT($MAGIC_CMD)
-else
- AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
- MAGIC_CMD=:
- fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
- [AC_HELP_STRING([--with-gnu-ld],
- [assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
- [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; 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
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [[\\/]]* | ?:[[\\/]]*)
- re_direlt='/[[^/]][[^/]]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
- 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"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; 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
- for ac_dir in $PATH; do
- 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"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's 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 "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-# -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
- lt_cv_ld_reload_flag,
- [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-# -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-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.
-# '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.
-
-case $host_os in
-aix4* | aix5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi4*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-mingw* | pw32*)
- # win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='win32_libid'
- ;;
-
-darwin* | rhapsody*)
- # this will be overwritten by pass_all, but leave it in just in case
- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
- ;;
- *) # Darwin 1.3 on
- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
- ;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | kfreebsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case "$host_cpu" in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- irix5* | nonstopux*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
- ;;
- *)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
- ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be Linux ELF.
-linux*)
- case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
- lt_cv_deplibs_check_method=pass_all ;;
- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
- arm* )
- lt_cv_deplibs_check_method=pass_all ;;
- *)
- # glibc up to 2.1.1 does not perform some relocations on ARM
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-nto-qnx*)
- lt_cv_deplibs_check_method=unknown
- ;;
-
-openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
- else
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
- lt_cv_file_magic_test_file=/shlib/libc.so
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- # Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
- break
- ;;
- *)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
- ;;
- esac
- esac
- fi
- done
- IFS="$lt_save_ifs"
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
- # These system don't have libm, or don't need it
- ;;
-*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
- ;;
-*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
- ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!). If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- case $enable_ltdl_convenience in
- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
- "") enable_ltdl_convenience=yes
- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
- esac
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!). If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_CHECK_LIB(ltdl, lt_dlinit,
- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
- [if test x"$enable_ltdl_install" = xno; then
- AC_MSG_WARN([libltdl not installed, but installation disabled])
- else
- enable_ltdl_install=yes
- fi
- ])
- if test x"$enable_ltdl_install" = x"yes"; then
- ac_configure_args="$ac_configure_args --enable-ltdl-install"
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
- else
- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
- LIBLTDL="-lltdl"
- LTDLINCL=
- fi
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# --------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
- case $host_os in
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
- ;;
- esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
- else
- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
- fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-# Report which librarie types wil 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
-
-# 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
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
-aix4*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- darwin* | rhapsody*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-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
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
- unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
-else
- unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-
- AC_PROG_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_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}'
-
- # 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_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- with_gnu_ld=no
- wlarc=
-
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
- fi
-
- # 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 "\-L"'
-
-else
- GXX=no
- with_gnu_ld=no
- wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aix4* | aix5*)
- if test "$host_cpu" = ia64; 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=""
- else
- # KDE requires run time linking. Make it the default.
- aix_use_runtimelinking=yes
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_AC_TAGVAR(archive_cmds, $1)=''
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes; 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`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- esac
- shared_flag='-shared'
- else
- # not using gcc
- if test "$host_cpu" = ia64; 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='-qmkshrobj ${wl}-G'
- else
- shared_flag='-qmkshrobj'
- fi
- fi
- fi
-
- # Let the compiler handle the export list.
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- # Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
- chorus*)
- case $cc_basename in
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- 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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- dgux*)
- case $cc_basename in
- ec++)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- ghcx)
- # Green Hills C++ Compiler
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- freebsd[12]*)
- # C++ shared libraries reported to be fairly broken before switch to ELF
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- freebsd-elf*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
- freebsd* | kfreebsd*-gnu)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- ;;
- gnu*)
- ;;
- hpux9*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
-
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
- esac
- fi
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- esac
-
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC)
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
- ;;
- esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
- case "$host_cpu" in
- ia64*|hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
- ;;
- esac
- fi
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- irix5* | irix6*)
- case $cc_basename in
- CC)
- # SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- fi
- fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
- esac
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
- linux*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $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; echo $list'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
- _LT_AC_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.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- ;;
- icpc)
- # Intel C++
- with_gnu_ld=yes
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- ;;
- cxx)
- # Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- esac
- ;;
- lynxos*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- m88k*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- mvs*)
- case $cc_basename in
- cxx)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
- osf3*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
- ;;
- RCC)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # 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 "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- osf4* | osf5*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- ;;
- RCC)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
- $rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # 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 "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- psos*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- sco*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- lcc)
- # Lucid
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- solaris*)
- case $cc_basename in
- CC)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
- # linker.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
- gcx)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
-
- # The C++ compiler must be used to create the archive.
- _LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
- if $CC --version | grep -v '^2\.7' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-
- # 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 \"\-L\""
- else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
- # platform.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-
- # 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 -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- fi
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- fi
- ;;
- esac
- ;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
- tandem*)
- case $cc_basename in
- NCC)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-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
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library. It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
- Foo (void) { a = 0; }
-private:
- int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
- subroutine foo
- implicit none
- integer*4 a
- a=0
- return
- end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
- private int a;
- public void bar (void) {
- a = 0;
- }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
-
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
- for p in `eval $output_verbose_link_cmd`; do
- case $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
- prev=$p
- continue
- else
- prev=
- fi
-
- if test "$pre_test_object_deps_done" = no; then
- case $p 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_AC_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
- else
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
- fi
- ;;
- # The "-l" case would never come before the object being
- # linked, so don't bother handling this case.
- esac
- else
- if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
- else
- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
- fi
- fi
- ;;
-
- *.$objext|*.$libext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- if test "$p" = "conftest.$objext"; then
- pre_test_object_deps_done=yes
- continue
- fi
-
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
- _LT_AC_TAGVAR(predep_objects, $1)="$p"
- else
- _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
- fi
- else
- if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
- _LT_AC_TAGVAR(postdep_objects, $1)="$p"
- else
- _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
- fi
- fi
- ;;
-
- *) ;; # Ignore the rest.
-
- esac
- done
-
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code=" program t\n end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-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
-
-# 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
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-aix4*)
- test "$enable_shared" = yes && enable_static=no
- ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-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
-AC_MSG_RESULT([$enable_static])
-
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars. Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- _LT_AC_TAGVAR(compiler, $1) \
- _LT_AC_TAGVAR(CC, $1) \
- _LT_AC_TAGVAR(LD, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
- _LT_AC_TAGVAR(old_archive_cmds, $1) \
- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
- _LT_AC_TAGVAR(predep_objects, $1) \
- _LT_AC_TAGVAR(postdep_objects, $1) \
- _LT_AC_TAGVAR(predeps, $1) \
- _LT_AC_TAGVAR(postdeps, $1) \
- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
- _LT_AC_TAGVAR(archive_cmds, $1) \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
- _LT_AC_TAGVAR(postinstall_cmds, $1) \
- _LT_AC_TAGVAR(postuninstall_cmds, $1) \
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
- _LT_AC_TAGVAR(allow_undefined_flag, $1) \
- _LT_AC_TAGVAR(no_undefined_flag, $1) \
- _LT_AC_TAGVAR(export_symbols_cmds, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
- _LT_AC_TAGVAR(hardcode_automatic, $1) \
- _LT_AC_TAGVAR(module_cmds, $1) \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
- _LT_AC_TAGVAR(exclude_expsyms, $1) \
- _LT_AC_TAGVAR(include_expsyms, $1); do
-
- case $var in
- _LT_AC_TAGVAR(old_archive_cmds, $1) | \
- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
- _LT_AC_TAGVAR(archive_cmds, $1) | \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
- _LT_AC_TAGVAR(module_cmds, $1) | \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\[$]0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
- ;;
- esac
-
-ifelse([$1], [],
- [cfgfile="${ofile}T"
- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
- $rm -f "$cfgfile"
- AC_MSG_NOTICE([creating $ofile])],
- [cfgfile="$ofile"])
-
- cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-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 in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# 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
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
- case $host_os in
- aix3*)
- cat <<\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
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-EOF
- ;;
- esac
-
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" || \
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-])
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- test -f Makefile && make "$ltmain"
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
- lt_cv_prog_compiler_rtti_exceptions,
- [-fno-rtti -fno-exceptions], [],
- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# 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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[[BCDT]]'
- ;;
-cygwin* | mingw* | pw32*)
- symcode='[[ABCDGISTW]]'
- ;;
-hpux*) # Its linker distinguishes data from code symbols
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDEGRST]]'
- fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
-irix* | nonstopux*)
- symcode='[[BCDEGRST]]'
- ;;
-osf*)
- symcode='[[BCDEGQRST]]'
- ;;
-solaris* | sysv5*)
- symcode='[[BDT]]'
- ;;
-sysv4)
- symcode='[[DFNSTU]]'
- ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[[ABCDGISTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
- else
- rm -f "$nlist"T
- fi
-
- # Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
- if grep ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
- else
- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
- else
- lt_cv_sys_global_symbol_pipe=
- fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- AC_MSG_RESULT(failed)
-else
- AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | os2* | pw32*)
- # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- case $host_os in
- aix4* | aix5*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
- chorus*)
- case $cc_basename in
- cxch68)
- # Green Hills C++ Compiler
- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- ;;
- esac
- ;;
- dgux*)
- case $cc_basename in
- ec++)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- ghcx)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- freebsd* | kfreebsd*-gnu)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
- case $cc_basename in
- CC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- fi
- ;;
- aCC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- ;;
- *)
- ;;
- esac
- ;;
- irix5* | irix6* | nonstopux*)
- case $cc_basename in
- CC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- # CC pic flag -KPIC is the default.
- ;;
- *)
- ;;
- esac
- ;;
- linux*)
- case $cc_basename in
- KCC)
- # KAI C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- icpc)
- # Intel C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- cxx)
- # Compaq C++
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- ;;
- esac
- ;;
- lynxos*)
- ;;
- m88k*)
- ;;
- mvs*)
- case $cc_basename in
- cxx)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- ;;
- *)
- ;;
- esac
- ;;
- netbsd*)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- ;;
- RCC)
- # Rational C++ 2.4.1
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- cxx)
- # Digital/Compaq C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- ;;
- esac
- ;;
- psos*)
- ;;
- sco*)
- case $cc_basename in
- CC)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- *)
- ;;
- esac
- ;;
- solaris*)
- case $cc_basename in
- CC)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- gcx)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- ;;
- *)
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC)
- # Sun C++ 4.x
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- lcc)
- # Lucid
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- tandem*)
- case $cc_basename in
- NCC)
- # NonStop-UX NCC 3.20
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- *)
- ;;
- esac
- ;;
- unixware*)
- ;;
- vxworks*)
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-],
-[
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | pw32* | os2*)
- # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- enable_shared=no
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
-
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
-
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-
- mingw* | pw32* | os2*)
- # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
- hpux9* | hpux10* | hpux11*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC (with -KPIC) is the default.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- newsos6)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- linux*)
- case $CC in
- icc* | ecc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- ccc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All Alpha code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- esac
- ;;
-
- osf3* | osf4* | osf5*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
- ;;
-
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sunos4*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- uts4*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
- esac],
- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case "$host_os" in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
- ;;
-esac
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
- aix4* | aix5*)
- # 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
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
- pw32*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- *)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-],[
- runpath_var=
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)=
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_AC_TAGVAR(hardcode_automatic, $1)=no
- _LT_AC_TAGVAR(module_cmds, $1)=
- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- _LT_AC_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'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
- # 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
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- extract_expsyms_cmds=
-
- case $host_os in
- cygwin* | mingw* | pw32*)
- # 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
- with_gnu_ld=no
- fi
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- esac
-
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3* | aix4* | aix5*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
- fi
- ;;
-
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- 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 $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- else
- ld_shlibs=no
- fi
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris* | sysv5*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
-
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-
- aix4* | aix5*)
- if test "$host_cpu" = ia64; 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=""
- 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
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
-
- # KDE requires run time linking. Make it the default.
- aix_use_runtimelinking=yes
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_AC_TAGVAR(archive_cmds, $1)=''
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GCC" = yes; 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`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- esac
- shared_flag='-shared'
- else
- # not using gcc
- if test "$host_cpu" = ia64; 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='-qmkshrobj ${wl}-G'
- else
- shared_flag='-qmkshrobj'
- fi
- fi
- fi
-
- # Let the compiler handle the export list.
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- # Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- # see comment about different semantics on the GNU ld section
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- bsdi4*)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-
- darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- dgux*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- freebsd1*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-
- hpux10* | hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
- ;;
- esac
- else
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- newsos6)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- openbsd*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- ;;
-
- os2*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
- # Both c and cxx compiler support -rpath directly
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- sco3.2v5*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
- solaris*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4)
- case $host_vendor in
- sni)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- ;;
- motorola)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4.3*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- fi
- ;;
-
- sysv4.2uw2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
-
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
- fi
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv5*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
- ;;
-
- uts4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
- # Assume -lc should be added
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $_LT_AC_TAGVAR(archive_cmds, $1) in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
- then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $rm conftest*
- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
- ;;
- esac
- fi
- ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# # ifdef __CYGWIN32__
-# # define __CYGWIN__ __CYGWIN32__
-# # endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-# __hDllInstance_base = hInst;
-# return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-############################################################
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-############################################################
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
-done
-lt_ac_max=0
-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 && break
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $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
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-done
-])
-SED=$lt_cv_path_SED
-AC_MSG_RESULT([$SED])
-])
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index dd92cb3..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,863 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([acinclude.m4])
diff --git a/admin b/admin
deleted file mode 160000
-Subproject 68f23556e638353e46b444d3a4863a64936bd36
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject 74654feb3bd49ba97c57e83ba2dd23c7c3d83c0
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 055c089..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,244 +0,0 @@
-/* config.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
-#undef HAVE_CARBON_CARBON_H
-
-/* Define if you have the CoreAudio API */
-#undef HAVE_COREAUDIO
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#undef HAVE_CRT_EXTERNS_H
-
-/* Defines if your system has the crypt function */
-#undef HAVE_CRYPT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have libjpeg */
-#undef HAVE_LIBJPEG
-
-/* Define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
-/* Define if you have libz */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if your system needs _NSGetEnviron to set up the environment */
-#undef HAVE_NSGETENVIRON
-
-/* Define if you have res_init */
-#undef HAVE_RES_INIT
-
-/* Define if you have the res_init prototype */
-#undef HAVE_RES_INIT_PROTO
-
-/* Define if you have a STL implementation by SGI */
-#undef HAVE_SGI_STL
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if you have strlcat */
-#undef HAVE_STRLCAT
-
-/* Define if you have the strlcat prototype */
-#undef HAVE_STRLCAT_PROTO
-
-/* Define if you have strlcpy */
-#undef HAVE_STRLCPY
-
-/* Define if you have the strlcpy prototype */
-#undef HAVE_STRLCPY_PROTO
-
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
-/* Suffix for lib directories */
-#undef KDELIBSUFF
-
-/* Define a safe value for MAXPATHLEN */
-#undef KDEMAXPATHLEN
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `char *', as computed by sizeof. */
-#undef SIZEOF_CHAR_P
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Defined if compiling without arts */
-#undef WITHOUT_ARTS
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-
-
-
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-
-
-
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-
-
-
-#if !defined(HAVE_RES_INIT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-int res_init(void);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCAT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcat(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCPY_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcpy(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-
-
-
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-
-
-/* type to use in place of socklen_t if not defined */
-#undef kde_socklen_t
-
-/* type to use in place of socklen_t if not defined (deprecated, use
- kde_socklen_t) */
-#undef ksize_t
diff --git a/configure.files b/configure.files
deleted file mode 100644
index 030bce8..0000000
--- a/configure.files
+++ /dev/null
@@ -1,2 +0,0 @@
-./admin/configure.in.min
-configure.in.in
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 7c1c9cf..0000000
--- a/configure.in
+++ /dev/null
@@ -1,122 +0,0 @@
-dnl =======================================================
-dnl FILE: ./admin/configure.in.min
-dnl =======================================================
-
-dnl This file is part of the KDE libraries/packages
-dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
-
-dnl This file is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2 of the License, or (at your option) any later version.
-
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Library General Public License for more details.
-
-dnl You should have received a copy of the GNU Library General Public License
-dnl along with this library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl Boston, MA 02110-1301, USA.
-
-# Original Author was Kalle@kde.org
-# I lifted it in some mater. (Stephan Kulow)
-# I used much code from Janos Farkas
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kbarcode, 2.0.7) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-KDE_PROG_LIBTOOL
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
-
-KDE_USE_TQT(3.0.0)
-AC_PATH_KDE
-dnl =======================================================
-dnl FILE: configure.in.in
-dnl =======================================================
-
-#MIN_CONFIG(3.0.0)
-
-dnl PACKAGE set before
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
-KDE_CREATE_SUBDIRSLIST
-AC_CONFIG_FILES([ Makefile ])
-AC_CONFIG_FILES([ fileplugin/Makefile ])
-AC_CONFIG_FILES([ kbarcode/Makefile ])
-AC_CONFIG_FILES([ po/Makefile ])
-AC_OUTPUT
-# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
-if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
- # And if so, warn when they don't match
- if test "$kde_libs_prefix" != "$given_prefix"; then
- # And if kde doesn't know about the prefix yet
- echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
- if test $? -ne 0; then
- echo ""
- echo "Warning: you chose to install this package in $given_prefix,"
- echo "but KDE was found in $kde_libs_prefix."
- echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
- echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
- echo "Then restart KDE."
- echo ""
- fi
- fi
-fi
-
-if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
- echo ""
- echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
- echo "was not included. Therefore, GCC symbol visibility support remains disabled."
- echo ""
- echo "For better performance, consider including the Qt visibility supporting patch"
- echo "located at:"
- echo ""
- echo "http://bugs.kde.org/show_bug.cgi?id=109386"
- echo ""
- echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
- echo "everything will continue to work just fine without it."
- echo ""
-fi
-
-if test "$all_tests" = "bad"; then
- if test ! "$cache_file" = "/dev/null"; then
- echo ""
- echo "Please remove the file $cache_file after changing your setup"
- echo "so that configure will find the changes next time."
- echo ""
- fi
-else
- echo ""
- echo "Good - your configure finished. Start make now"
- echo ""
-fi
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index 70485d4..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#MIN_CONFIG(3.0.0)
-KDE_ENABLE_HIDDEN_VISIBILITY
-
-AM_INIT_AUTOMAKE(kbarcode, 2.0.7)
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
-AC_ARG_WITH(native-gnu-barcode,
- AC_HELP_STRING([--without-native-gnu-barcode],[disable build with GNU Barcode [default=auto]]),
- [with_native_gnu_barcode=$withval],
- [with_native_gnu_barcode=auto]
-)
-if test "$with_native_gnu_barcode" != "no"; then
- KDE_CHECK_HEADERS([barcode.h], [have_gnu_barcode="yes"], [have_gnu_barcode=no])
- if test "$have_gnu_barcode" = "yes"; then
- AC_DEFINE(_ENABLE_NATIVE_GNU_BARCODE, 1, [Define to 1 if you have <barcode.h> header file.])
- else
- if test "$with_native_gnu_barcode" = "yes"; then
- echo "Barcode is requested, but GNU Barcode header was not found on your system"
- exit
- fi
- fi
-fi
-
-AC_ARG_WITH(javascript,
- AC_HELP_STRING([--without-javascript],[build KBarcode without javascript interpreter [default=auto]]),
- [with_javascript=$withval],
- [with_javascript=auto]
-)
-if test "$with_javascript" != "no"; then
- KDE_CHECK_HEADERS([kjs/interpreter.h], [have_javascript="yes"], [have_javascript=no])
- if test "$have_javascript" = "yes"; then
- AC_DEFINE(USE_JAVASCRIPT, 1, [Define to 1 if you have <kjs/interpreter.h> header file.])
- AC_DEFINE(NO_KJS_EMBED, 1, [Define to 1 for use tdelibs javascript interpreter])
- else
- if test "$with_javascript" = "yes"; then
- echo "Javascript interpreter is requested, but tdelibs Javascript header (kjs) was not found on your system"
- exit
- fi
- fi
-fi
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644
index 6d0aa9f..0000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_auto_add_subdirectories( )
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 5c0b20e..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = AUTO
-SUBDIRS = $(AUTODIRS)
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
deleted file mode 100644
index ba3ef3e..0000000
--- a/doc/en/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_create_handbook( DESTINATION ${PROJECT_NAME} )
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
deleted file mode 100644
index 4f4efb4..0000000
--- a/doc/en/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = kbarcode
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
deleted file mode 100644
index 8512250..0000000
--- a/doc/man/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-INSTALL(
- FILES ${PROJECT_NAME}.1
- DESTINATION ${MAN_INSTALL_DIR}/man1
- COMPONENT doc
-)
diff --git a/doc/man/kbarcode.1 b/doc/man/kbarcode.1
index b81aee5..711a8e6 100644
--- a/doc/man/kbarcode.1
+++ b/doc/man/kbarcode.1
@@ -4,7 +4,7 @@
kbarcode
\- KBarcode is a barcode and label printing application
.SH SYNOPSIS
-\fBkbarcode\fP [Qt\-options] [TDE\-options] [\fIfile\fP]
+\fBkbarcode\fP [TQt\-options] [TDE\-options] [\fIfile\fP]
.SH DESCRIPTION
\fBKBarcode\fP is a barcode and label printing application for TDE. It can be used to print everything from simple business cards up to complex labels with several barcodes, such as article descriptions.
.sp 1
@@ -50,8 +50,8 @@ print immediately in batch mode
.B \-\-help
Show help about options
.TP
-.B \-\-help\-qt
-Show Qt specific options
+.B \-\-help\-tqt
+Show TQt specific options
.TP
.B \-\-help\-tde
Show TDE specific options
@@ -71,7 +71,7 @@ Show license information
.B \-\-
End of options
.SS
-.SS Qt options:
+.SS TQt options:
.TP
.B \-\-display <displayname>
Use the X\-server display 'displayname'
@@ -90,7 +90,7 @@ using the QApplication::ManyColor color
specification
.TP
.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
+tells TQt to never grab the mouse or the keyboard
.TP
.B \-\-dograb
running under a debugger can cause an implicit
diff --git a/fileplugin/CMakeLists.txt b/fileplugin/CMakeLists.txt
index 78af279..bd9debe 100644
--- a/fileplugin/CMakeLists.txt
+++ b/fileplugin/CMakeLists.txt
@@ -28,7 +28,7 @@ tde_add_kpart( tdefile_kbarcode AUTOMOC
##### other data
-install(
- FILES tdefile_kbarcode.desktop
+tde_create_translated_desktop(
+ SOURCE tdefile_kbarcode.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/fileplugin/Makefile.am b/fileplugin/Makefile.am
deleted file mode 100644
index c98fff9..0000000
--- a/fileplugin/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = $(all_includes)
-
-kde_module_LTLIBRARIES = tdefile_kbarcode.la
-
-tdefile_kbarcode_la_SOURCES = tdefile_kbarcode.cpp
-tdefile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TQT) $(all_libraries)
-tdefile_kbarcode_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDECORE) $(LIB_TQT)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-# messages: rc.cpp
-# $(XGETTEXT) *.cpp -o $(podir)/tdefile_kbarcode.pot
-
-services_DATA = tdefile_kbarcode.desktop
-servicesdir = $(kde_servicesdir)
-
diff --git a/fileplugin/tdefile_kbarcode.h b/fileplugin/tdefile_kbarcode.h
index ae0a64d..5b9423d 100644
--- a/fileplugin/tdefile_kbarcode.h
+++ b/fileplugin/tdefile_kbarcode.h
@@ -11,7 +11,7 @@ class TQStringList;
class KBarcodePlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kbarcode.spec b/kbarcode.spec
deleted file mode 100644
index bd6ef88..0000000
--- a/kbarcode.spec
+++ /dev/null
@@ -1,50 +0,0 @@
-%define name kbarcode
-%define version 2.0.7
-Summary: A barcode and label printing application for KDE
-Name: %{name}
-Version: %{version}
-Release: 1
-License: GPL
-Vendor: Dominik Seichter <domseichter@web.de>
-Url: http://www.kbarcode.net
-Packager: Dominik Seichter <domseichter@web.de>
-Group: kde/utilities
-Source: %{name}-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-%{version}
-
-%description
-KBarcode is a barcode and label printing application for Linux and TDE. It can be used to print every thing from simple business cards up to complex labels with several barcodes (e.g. article descriptions). KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard, batch import of labels (directly from the delivery note), thousands of predefined labels, database managment tools and translations in many languages. Even printing more than 10.000 labels in one go is no problem for KBarcode. Additionally it is a simply xbarcode replacement for the creation of barcodes. All major types of barcodes like EAN, UPC, CODE39 and ISBN are supported.
-
-%prep
-%setup
-./configure
-
-%build
-
-# Setup for parallel builds
-numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
-if [ "$numprocs" = "0" ]; then
- numprocs=1
-fi
-
-make -j$numprocs
-
-%install
-make install-strip DESTDIR=$RPM_BUILD_ROOT
-
-cd $RPM_BUILD_ROOT
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.kbarcode
-find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kbarcode
-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kbarcode
-
-%clean
-rm -rf $RPM_BUILD_ROOT/*
-rm -rf $RPM_BUILD_DIR/kbarcode-%{version}
-rm -rf ../file.list.kbarcode
-
-
-%files -f ../file.list.kbarcode
-
-
-
-
diff --git a/kbarcode.tdevelop b/kbarcode.tdevelop
deleted file mode 100644
index 5142f62..0000000
--- a/kbarcode.tdevelop
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version = '1.0'?>
-<tdevelop>
- <general>
- <author>Dominik Seichter</author>
- <email>domseichter@web.de</email>
- <version>1.9.1</version>
- <projectmanagement>KDevKDEAutoProject</projectmanagement>
- <primarylanguage>C++</primarylanguage>
- <keywords>
- <keyword>C++</keyword>
- <keyword>Code</keyword>
- <keyword>Qt</keyword>
- <keyword>KDE</keyword>
- <keyword>DCOP</keyword>
- </keywords>
- <projectdirectory>.</projectdirectory>
- <absoluteprojectpath>false</absoluteprojectpath>
- <description/>
- <ignoreparts/>
- <secondaryLanguages>
- <language>SQL</language>
- </secondaryLanguages>
- </general>
- <kdevautoproject>
- <general>
- <activetarget>kbarcode/kbarcode</activetarget>
- <useconfiguration>default</useconfiguration>
- </general>
- <run>
- <mainprogram>kbarcode/kbarcode</mainprogram>
- <directoryradio>executable</directoryradio>
- <runarguments>
- <kbarcode/>
- </runarguments>
- <customdirectory>/</customdirectory>
- <programargs/>
- <terminal>false</terminal>
- <autocompile>true</autocompile>
- <envvars/>
- </run>
- <configurations>
- <optimized>
- <builddir>optimized</builddir>
- <ccompiler>GccOptions</ccompiler>
- <cxxcompiler>GppOptions</cxxcompiler>
- <f77compiler>G77Options</f77compiler>
- <cxxflags>-O2 -g0</cxxflags>
- </optimized>
- <debug>
- <configargs>--enable-debug=full</configargs>
- <builddir>debug</builddir>
- <ccompiler>GccOptions</ccompiler>
- <cxxcompiler>GppOptions</cxxcompiler>
- <f77compiler>G77Options</f77compiler>
- <cxxflags>-O0 -g3</cxxflags>
- </debug>
- <default>
- <envvars/>
- </default>
- </configurations>
- <make>
- <envvars>
- <envvar value="1" name="WANT_AUTOCONF_2_5" />
- <envvar value="1" name="WANT_AUTOMAKE_1_6" />
- </envvars>
- <abortonerror>true</abortonerror>
- <numberofjobs>1</numberofjobs>
- <dontact>false</dontact>
- <makebin/>
- <prio>0</prio>
- </make>
- </kdevautoproject>
- <kdevfileview>
- <groups>
- <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
- <group pattern="*.ui" name="User Interface" />
- <group pattern="*.png" name="Icons" />
- <group pattern="*.po;*.ts" name="Translations" />
- <group pattern="*" name="Others" />
- <hidenonprojectfiles>false</hidenonprojectfiles>
- <hidenonlocation>false</hidenonlocation>
- </groups>
- <tree>
- <hidepatterns>*.o,*.lo,CVS</hidepatterns>
- <hidenonprojectfiles>false</hidenonprojectfiles>
- <showvcsfields>false</showvcsfields>
- </tree>
- </kdevfileview>
- <kdevdoctreeview>
- <ignoretocs>
- <toc>gtk</toc>
- <toc>gnustep</toc>
- <toc>python</toc>
- <toc>php</toc>
- <toc>perl</toc>
- </ignoretocs>
- <projectdoc>
- <userdocDir>html/</userdocDir>
- <apidocDir>html/</apidocDir>
- </projectdoc>
- <ignoreqt_xml/>
- <ignoredoxygen/>
- <ignorekdocs/>
- <ignoredevhelp/>
- </kdevdoctreeview>
- <kdevdebugger>
- <general>
- <dbgshell>libtool</dbgshell>
- <programargs/>
- <gdbpath/>
- <configGdbScript/>
- <runShellScript/>
- <runGdbScript/>
- <breakonloadinglibs>true</breakonloadinglibs>
- <separatetty>false</separatetty>
- <floatingtoolbar>false</floatingtoolbar>
- </general>
- <display>
- <staticmembers>true</staticmembers>
- <demanglenames>true</demanglenames>
- <outputradix>10</outputradix>
- </display>
- </kdevdebugger>
- <kdevfilecreate>
- <filetypes/>
- <useglobaltypes>
- <type ext="ui" />
- <type ext="cpp" />
- <type ext="h" />
- </useglobaltypes>
- </kdevfilecreate>
- <kdevcppsupport>
- <references>
- <pcs>KDElibs</pcs>
- </references>
- <codecompletion>
- <includeGlobalFunctions>true</includeGlobalFunctions>
- <includeTypes>true</includeTypes>
- <includeEnums>true</includeEnums>
- <includeTypedefs>false</includeTypedefs>
- <automaticCodeCompletion>true</automaticCodeCompletion>
- <automaticArgumentsHint>true</automaticArgumentsHint>
- <automaticHeaderCompletion>true</automaticHeaderCompletion>
- <codeCompletionDelay>250</codeCompletionDelay>
- <argumentsHintDelay>400</argumentsHintDelay>
- <headerCompletionDelay>250</headerCompletionDelay>
- </codecompletion>
- </kdevcppsupport>
- <cppsupportpart>
- <filetemplates>
- <interfacesuffix>.h</interfacesuffix>
- <implementationsuffix>.cpp</implementationsuffix>
- </filetemplates>
- </cppsupportpart>
- <dist>
- <custom>false</custom>
- <bzip>false</bzip>
- <archname/>
- <appname>kbarcode</appname>
- <version>1.8.0</version>
- <release/>
- <vendor/>
- <licence>GPL</licence>
- <summary/>
- <group/>
- <packager/>
- <description/>
- <changelog/>
- <devpackage>false</devpackage>
- <docspackage>false</docspackage>
- <appicon>false</appicon>
- <arch>0</arch>
- <genHTML>false</genHTML>
- <useRPM>false</useRPM>
- <ftpkde>false</ftpkde>
- <appskde>false</appskde>
- <url/>
- </dist>
- <kdevcvsservice>
- <recursivewhenupdate>true</recursivewhenupdate>
- <prunedirswhenupdate>true</prunedirswhenupdate>
- <createdirswhenupdate>true</createdirswhenupdate>
- <recursivewhencommitremove>true</recursivewhencommitremove>
- <revertoptions>-C</revertoptions>
- </kdevcvsservice>
- <kdevdocumentation>
- <projectdoc>
- <docsystem/>
- <docurl/>
- <usermanualurl/>
- </projectdoc>
- </kdevdocumentation>
-</tdevelop>
diff --git a/kbarcode/CMakeL10n.txt b/kbarcode/CMakeL10n.txt
index 2e63f3f..7c33676 100644
--- a/kbarcode/CMakeL10n.txt
+++ b/kbarcode/CMakeL10n.txt
@@ -1,3 +1,3 @@
##### create translation templates ##############
-tde_l10n_create_template( "kbarcode" )
+tde_l10n_create_template( "messages/kbarcode" )
diff --git a/kbarcode/CMakeLists.txt b/kbarcode/CMakeLists.txt
index a16fbb0..08984ee 100644
--- a/kbarcode/CMakeLists.txt
+++ b/kbarcode/CMakeLists.txt
@@ -70,18 +70,17 @@ tde_install_icons( )
##### other data
-install(
- FILES
+tde_create_translated_desktop(
+ SOURCE
${PROJECT_NAME}.desktop
${PROJECT_NAME}-batch.desktop
${PROJECT_NAME}-editor.desktop
${PROJECT_NAME}-single.desktop
-
- DESTINATION ${XDG_APPS_INSTALL_DIR}
)
-install(
- FILES ${PROJECT_NAME}-label.desktop
+
+tde_create_translated_desktop(
+ SOURCE ${PROJECT_NAME}-label.desktop
DESTINATION ${MIME_INSTALL_DIR}/application
)
diff --git a/kbarcode/Makefile.am b/kbarcode/Makefile.am
deleted file mode 100644
index ee19171..0000000
--- a/kbarcode/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-## Makefile.am for kbarcode
-
-SUBDIRS = pics
-
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/src $(all_includes)
-
-# these are the headers for your project
-
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-KDE_ICON = AUTO
-
-messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kbarcode.pot
-
-# this is the program that gets installed. it's name is used for all
-# of the other Makefile.am variables
-bin_PROGRAMS = kbarcode
-
-# the application source, library search path, and link libraries
-
-kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kbarcode_LDADD = $(LIB_TDEABC) $(LIB_TDESPELL) $(LIB_TDEPRINT) \
- $(LIB_TDEUI) -lkjs -lpcre
-
-noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h commands.h \
- configdialog.h confwizard.h csvimportdlg.h databasebrowser.h definition.h \
- definitiondialog.h dsmainwindow.h kbarcode.h label.h labeleditor.h labelutils.h \
- mimesources.h multilineeditdlg.h mycanvasitem.h mycanvasview.h mydatatable.h \
- newlabel.h previewdialog.h printersettings.h printlabeldlg.h rectsettingsdlg.h \
- smalldialogs.h sqltables.h tokenprovider.h xmlutils.h zplutils.h measurements.h \
- editoriface.h kbarcodeiface.h batchiface.h kbarcodesettings.h batchprinter.h \
- barcodeitem.h documentitem.h lineitem.h rectitem.h tcanvasitem.h textitem.h \
- imageitem.h documentitemdlg.h propertywidget.h tec.h barcodeprinterdlg.h \
- textlineitem.h textlineedit.h tokendialog.h barkode.h gnubarcode.h barkodeengine.h \
- pixmapbarcode.h batchwizard.h csvfile.h referencecounted.h dstextedit.h encodingcombo.h \
- purepostscript.h tbarcode2.h
-
-kbarcode_SOURCES = barcodecombo.cpp barcodedialog.cpp barcodedialogs.cpp \
- commands.cpp configdialog.cpp confwizard.cpp csvimportdlg.cpp databasebrowser.cpp \
- definition.cpp definitiondialog.cpp dsmainwindow.cpp kbarcode.cpp label.cpp \
- labeleditor.cpp labelutils.cpp main.cpp mimesources.cpp multilineeditdlg.cpp \
- mycanvasitem.cpp mycanvasview.cpp mydatatable.cpp newlabel.cpp previewdialog.cpp \
- printersettings.cpp printlabeldlg.cpp rectsettingsdlg.cpp smalldialogs.cpp sqltables.cpp \
- tokenprovider.cpp xmlutils.cpp zplutils.cpp measurements.cpp editoriface.skel \
- kbarcodeiface.skel batchiface.skel kbarcodesettings.cpp batchprinter.cpp barcodeitem.cpp \
- documentitem.cpp lineitem.cpp rectitem.cpp tcanvasitem.cpp textitem.cpp imageitem.cpp \
- documentitemdlg.cpp propertywidget.cpp tec.cpp barcodeprinterdlg.cpp textlineitem.cpp \
- textlineedit.cpp tokendialog.cpp barkode.cpp gnubarcode.cpp barkodeengine.cpp \
- pixmapbarcode.cpp batchwizard.cpp csvfile.cpp dstextedit.cpp encodingcombo.cpp \
- purepostscript.cpp tbarcode2.cpp
-
-xdg_apps_DATA = kbarcode.desktop kbarcode-batch.desktop kbarcode-editor.desktop kbarcode-single.desktop
-
-mimetype_DATA = kbarcode-label.desktop
-
-datafiles_DATA = barcodes.html exampledata.sql labeldefinitions.sql barcode.ps rules.xml
-datafilesdir = $(kde_datadir)/kbarcode
-mimetypedir = $(kde_mimedir)/application
diff --git a/kbarcode/barcodecombo.cpp b/kbarcode/barcodecombo.cpp
index 21208a6..e1e9dd8 100644
--- a/kbarcode/barcodecombo.cpp
+++ b/kbarcode/barcodecombo.cpp
@@ -112,7 +112,7 @@ void BarcodeCombo::setEncodingType( const TQString & type )
}
BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
- : TQWidget( parent, name ), m_validator( TQT_TQOBJECT(this) )
+ : TQWidget( parent, name ), m_validator( this )
{
m_token = NULL;
@@ -122,8 +122,8 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
grid->addWidget( labelStandard, 1, 0 );
comboStandard = new BarcodeCombo( this, "comboStandard" );
- connect( comboStandard, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( encodingChanged() ) );
- connect( comboStandard, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( changed() ) );
+ connect( comboStandard, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( encodingChanged() ) );
+ connect( comboStandard, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( changed() ) );
grid->addMultiCellWidget( comboStandard, 1, 1, 1, 3 );
labelStandard->setBuddy( comboStandard );
@@ -133,8 +133,8 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
data = new KLineEdit( this, "data" );
labelData->setBuddy( data );
- connect( data, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( changed() ) );
- connect( data, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotValidateValue() ) );
+ connect( data, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( changed() ) );
+ connect( data, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotValidateValue() ) );
grid->addMultiCellWidget( data, 2, 2, 1, 3 );
multi = new KTextEdit( this );
@@ -145,13 +145,13 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
multi->setVScrollBarMode( TQScrollView::AlwaysOn );
multi->setHScrollBarMode( TQScrollView::AlwaysOn );
multi->hide();
- connect( multi, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( changed() ) );
+ connect( multi, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( changed() ) );
grid->addMultiCellWidget( multi, 3, 3, 1, 3 );
checkText = new TQCheckBox( this, "checkText" );
checkText->setText( i18n( "&Display text" ) );
checkText->setChecked( true );
- connect( checkText, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changed() ) );
+ connect( checkText, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changed() ) );
grid->addWidget( checkText, 4, 1 );
buttonAdvanced = new KPushButton( i18n("&Advanced..."), this );
@@ -166,31 +166,31 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
spinMargin->setLabel( i18n( "&Margin:" ), KNumInput::AlignLeft | KNumInput::AlignVCenter );
spinMargin->setRange( 0, 10000, 1, false );
spinMargin->setValue( 10 );
- connect( spinMargin, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( changed() ) );
+ connect( spinMargin, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( changed() ) );
grid->addMultiCellWidget( spinMargin, 5, 5, 0, 1 );
spinRotation = new KIntNumInput( this );
spinRotation->setLabel( i18n( "&Rotation:" ), KNumInput::AlignLeft | KNumInput::AlignVCenter );
spinRotation->setRange( 0, 360, 90, false );
spinRotation->setValue( 0 );
- connect( spinRotation, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( changed() ) );
+ connect( spinRotation, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( changed() ) );
grid->addMultiCellWidget( spinRotation, 5, 5, 2, 3 );
spinScale = new KIntNumInput( spinMargin, 1000, this );
spinScale->setLabel( i18n("&Scale (in permille):"), KNumInput::AlignLeft | KNumInput::AlignVCenter );
spinScale->setRange( 100, 10000, 100, false );
spinScale->setValue( 1000 );
- connect( spinScale, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( changed() ) );
+ connect( spinScale, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( changed() ) );
grid->addMultiCellWidget( spinScale, 6, 6, 0, 1 );
spinCut = new KIntNumInput( spinRotation, 100, this );
spinCut->setLabel( i18n("&Crop:"), KNumInput::AlignLeft | KNumInput::AlignVCenter );
spinCut->setRange( 1, 100, 1, false );
- connect( spinCut, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( changed() ) );
+ connect( spinCut, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( changed() ) );
grid->addMultiCellWidget( spinCut, 6, 6, 2, 3 );
- connect( buttonAdvanced, TQT_SIGNAL( clicked() ), this, TQT_SLOT( advanced() ) );
- connect( buttonToken, TQT_SIGNAL( clicked() ), this, TQT_SLOT( tokens() ) );
+ connect( buttonAdvanced, TQ_SIGNAL( clicked() ), this, TQ_SLOT( advanced() ) );
+ connect( buttonToken, TQ_SIGNAL( clicked() ), this, TQ_SLOT( tokens() ) );
m_enabledata = true;
m_multi = false;
@@ -200,7 +200,7 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
void BarcodeWidget::getData( Barkode & barcode )
{
// make sure all changes are applied to the barcode
- // even if not all widgets have emitted their changed TQT_SIGNAL yet
+ // even if not all widgets have emitted their changed TQ_SIGNAL yet
this->changed();
barcode = m_barcode;
diff --git a/kbarcode/barcodecombo.h b/kbarcode/barcodecombo.h
index cfc260e..b7e606a 100644
--- a/kbarcode/barcodecombo.h
+++ b/kbarcode/barcodecombo.h
@@ -54,7 +54,7 @@ class BarcodeValidator : public TQValidator {
* supported by KBarcode.
*/
class BarcodeCombo : public KComboBox {
- Q_OBJECT
+ TQ_OBJECT
public:
BarcodeCombo(TQWidget *parent=0, const char *name=0);
@@ -80,7 +80,7 @@ class TQLabel;
* @author Dominik Seichter
*/
class BarcodeWidget : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
BarcodeWidget(TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp
index 3919f74..df57d6c 100644
--- a/kbarcode/barcodedialog.cpp
+++ b/kbarcode/barcodedialog.cpp
@@ -50,7 +50,7 @@ BarCodeDialog::BarCodeDialog( TQWidget* parent, const char* name )
Layout6 = new TQVBoxLayout( 0, 0, 6, "Layout2");
widget = new BarcodeWidget( this, "widget" );
- m_token = new TokenProvider( TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
+ m_token = new TokenProvider( TDEApplication::desktop() );
widget->setTokenProvider( m_token );
buttonGenerate = new KPushButton( this, "buttonGenerate" );
@@ -82,10 +82,10 @@ BarCodeDialog::BarCodeDialog( TQWidget* parent, const char* name )
barcode = new TQLabel( sv->viewport(), "barcode" );
sv->addChild( barcode );
- connect( buttonGenerate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( generate() ) );
- connect( buttonSave, TQT_SIGNAL( clicked() ), this, TQT_SLOT( save() ) );
- connect( buttonPrint, TQT_SIGNAL( clicked() ), this, TQT_SLOT( print() ) );
- connect( buttonCopy, TQT_SIGNAL( clicked() ), this, TQT_SLOT( copy() ) );
+ connect( buttonGenerate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( generate() ) );
+ connect( buttonSave, TQ_SIGNAL( clicked() ), this, TQ_SLOT( save() ) );
+ connect( buttonPrint, TQ_SIGNAL( clicked() ), this, TQ_SLOT( print() ) );
+ connect( buttonCopy, TQ_SIGNAL( clicked() ), this, TQ_SLOT( copy() ) );
TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
@@ -103,7 +103,7 @@ BarCodeDialog::BarCodeDialog( TQWidget* parent, const char* name )
BarCodeDialogLayout->addLayout( Layout5 );
BarCodeDialogLayout->setStretchFactor( Layout6, 2 );
- connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
+ connect( buttonClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() ) );
buttonGenerate->setDefault( true );
@@ -120,7 +120,7 @@ void BarCodeDialog::generate()
Barkode d;
widget->getData( d );
d.setTokenProvider( m_token );
- d.update( TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
+ d.update( TDEApplication::desktop() );
barcode->setPixmap( d.pixmap() );
@@ -149,7 +149,7 @@ void BarCodeDialog::save()
bc.setTokenProvider( m_token );
- bc.update( TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
+ bc.update( TDEApplication::desktop() );
if(!bc.pixmap().save( path, extension.utf8(), 0 ))
KMessageBox::error( this, i18n("An error occurred during saving the image") );
@@ -204,7 +204,7 @@ void BarCodeDialog::copy()
BarcodeItem* item = new BarcodeItem( bc );
DocumentItemList list;
- list.append( item );
+ list.push_back( item );
DocumentItemDrag* drag = new DocumentItemDrag();
drag->setDocumentItem( &list );
diff --git a/kbarcode/barcodedialog.h b/kbarcode/barcodedialog.h
index 691786a..ea1e603 100644
--- a/kbarcode/barcodedialog.h
+++ b/kbarcode/barcodedialog.h
@@ -47,7 +47,7 @@ class TokenProvider;
*/
class BarCodeDialog : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kbarcode/barcodedialogs.cpp b/kbarcode/barcodedialogs.cpp
index 22411c5..89f6135 100644
--- a/kbarcode/barcodedialogs.cpp
+++ b/kbarcode/barcodedialogs.cpp
@@ -106,7 +106,7 @@ TBarcodeDlg::TBarcodeDlg(TQWidget *parent, const char *name )
TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 );
TQGroupBox* gb = new TQGroupBox( i18n("TBarcode"), this );
- gb->setColumnLayout(0, Qt::Vertical );
+ gb->setColumnLayout(0, TQt::Vertical );
gb->layout()->setSpacing( 6 );
gb->layout()->setMargin( 11 );
gb->setEnabled( Barkode::haveTBarcode() || Barkode::haveTBarcode2() );
@@ -252,7 +252,7 @@ PDF417BarcodeDlg::PDF417BarcodeDlg(TQWidget *parent, const char *name )
TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 );
TQGroupBox* gpdf = new TQGroupBox( i18n("PDF417"), this );
- gpdf->setColumnLayout(0, Qt::Vertical );
+ gpdf->setColumnLayout(0, TQt::Vertical );
gpdf->layout()->setSpacing( 6 );
gpdf->layout()->setMargin( 11 );
gpdf->setEnabled( Barkode::haveTBarcode() || Barkode::havePDFBarcode() );
@@ -360,7 +360,7 @@ SequenceDlg::SequenceDlg( TQWidget *parent, const char *name )
TQVBoxLayout* main = new TQVBoxLayout( this, 6, 6 );
TQButtonGroup* group = new TQButtonGroup( i18n("Sequence"), this );
- group->setColumnLayout(0, Qt::Vertical );
+ group->setColumnLayout(0, TQt::Vertical );
group->layout()->setSpacing( 6 );
group->layout()->setMargin( 11 );
TQVBoxLayout* layout = new TQVBoxLayout( group->layout() );
@@ -388,10 +388,10 @@ SequenceDlg::SequenceDlg( TQWidget *parent, const char *name )
main->addWidget( group );
- connect( checkSequence, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioNumbers, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioAlpha, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioAlphaNum, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( checkSequence, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioNumbers, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioAlpha, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioAlphaNum, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
}
void SequenceDlg::setData( Barkode* b )
@@ -438,7 +438,7 @@ ColorDlg::ColorDlg(TQWidget *parent, const char *name)
: TQVBox( parent, name )
{
TQGroupBox* gb = new TQGroupBox( i18n("Colors"), this );
- gb->setColumnLayout(0, Qt::Vertical );
+ gb->setColumnLayout(0, TQt::Vertical );
gb->layout()->setSpacing( 6 );
gb->layout()->setMargin( 11 );
gb->setEnabled( Barkode::havePurePostscriptBarcode() );
diff --git a/kbarcode/barcodedialogs.h b/kbarcode/barcodedialogs.h
index 5f2b9b6..d914480 100644
--- a/kbarcode/barcodedialogs.h
+++ b/kbarcode/barcodedialogs.h
@@ -55,7 +55,7 @@ class BarcodeDlgBase {
* @author Dominik Seichter
*/
class AdvancedBarcodeDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
AdvancedBarcodeDialog( TQString type, TQWidget* parent = 0, const char* name = 0 );
@@ -72,7 +72,7 @@ class AdvancedBarcodeDialog : public KDialogBase {
* @author Dominik Seichter
*/
class TBarcodeDlg : public TQWidget, public BarcodeDlgBase {
- Q_OBJECT
+ TQ_OBJECT
public:
TBarcodeDlg(TQWidget *parent=0, const char *name=0);
@@ -95,7 +95,7 @@ class TBarcodeDlg : public TQWidget, public BarcodeDlgBase {
* @author Dominik Seichter
*/
class PDF417BarcodeDlg : public TQWidget, public BarcodeDlgBase {
- Q_OBJECT
+ TQ_OBJECT
public:
PDF417BarcodeDlg(TQWidget *parent=0, const char *name=0);
@@ -113,7 +113,7 @@ class PDF417BarcodeDlg : public TQWidget, public BarcodeDlgBase {
* @author Dominik Seichter
*/
class DataMatrixDlg : public TQWidget, public BarcodeDlgBase {
- Q_OBJECT
+ TQ_OBJECT
public:
DataMatrixDlg(TQWidget *parent=0, const char *name=0);
@@ -129,7 +129,7 @@ class DataMatrixDlg : public TQWidget, public BarcodeDlgBase {
* @author Dominik Seichter
*/
class SequenceDlg : public TQWidget, public BarcodeDlgBase {
- Q_OBJECT
+ TQ_OBJECT
public:
SequenceDlg(TQWidget *parent=0, const char *name=0);
@@ -154,7 +154,7 @@ class SequenceDlg : public TQWidget, public BarcodeDlgBase {
* @author Dominik Seichter
*/
class ColorDlg : public TQVBox, public BarcodeDlgBase {
- Q_OBJECT
+ TQ_OBJECT
public:
ColorDlg(TQWidget *parent=0, const char *name=0);
@@ -172,7 +172,7 @@ class ColorDlg : public TQVBox, public BarcodeDlgBase {
* @author Dominik Seichter
*/
class PurePostscriptDlg : public TQVBox, public BarcodeDlgBase {
- Q_OBJECT
+ TQ_OBJECT
public:
PurePostscriptDlg(TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/barcodeprinterdlg.cpp b/kbarcode/barcodeprinterdlg.cpp
index 5470dd0..3ae416b 100644
--- a/kbarcode/barcodeprinterdlg.cpp
+++ b/kbarcode/barcodeprinterdlg.cpp
@@ -68,7 +68,7 @@ BarcodePrinterDlg::BarcodePrinterDlg(TQWidget *parent, const char *name)
comboDevice->insertItem( "/dev/usb/lp1" );
comboDevice->insertItem( "/dev/usb/lp2" );
- connect( checkFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( checkFile, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
// KFileDialog fd( TQString(), "*.zpl|Zebra Printer Language (*.zpl)\n*.ipl|Intermec Printer Language (*.ipl)", this, "fd", true );
diff --git a/kbarcode/barcodeprinterdlg.h b/kbarcode/barcodeprinterdlg.h
index 4cd60d4..61e08e0 100644
--- a/kbarcode/barcodeprinterdlg.h
+++ b/kbarcode/barcodeprinterdlg.h
@@ -29,7 +29,7 @@ class TQLabel;
*/
class BarcodePrinterDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
BarcodePrinterDlg(TQWidget *parent = 0, const char *name = 0);
diff --git a/kbarcode/batchprinter.cpp b/kbarcode/batchprinter.cpp
index 2188112..076af62 100644
--- a/kbarcode/batchprinter.cpp
+++ b/kbarcode/batchprinter.cpp
@@ -70,7 +70,7 @@ BatchPrinter::BatchPrinter( const TQString & path, TQWidget* p )
m_cur_data_count = 0;
- m_paintDevice = TQT_TQPAINTDEVICE(p);
+ m_paintDevice = p;
}
BatchPrinter::BatchPrinter( const TQString & path, int format, TQWidget* _parent )
@@ -84,7 +84,7 @@ BatchPrinter::BatchPrinter( const TQString & path, int format, TQWidget* _parent
m_cur_data_count = 0;
- m_paintDevice = TQT_TQPAINTDEVICE(_parent);
+ m_paintDevice = _parent;
}
BatchPrinter::~BatchPrinter()
@@ -133,7 +133,7 @@ void BatchPrinter::startPrintData( TQProgressDialog* progress )
for( unsigned int i = 0; i < m_data->count(); i++ )
{
- Label l( def, TQT_TQIODEVICE(buffer), m_name, printer, m_customer,
+ Label l( def, buffer, m_name, printer, m_customer,
(*m_data)[i].article_no, (*m_data)[i].group );
l.setSerial( m_serial, m_increment );
@@ -245,19 +245,19 @@ Label* BatchPrinter::initLabel( int* number )
if( m_vardata )
{
- l = new Label( def, TQT_TQIODEVICE(buffer), m_name, m_paintDevice );
+ l = new Label( def, buffer, m_name, m_paintDevice );
l->setUserVars( (*m_vardata)[m_cur_data_count] );
}
else if( m_data )
{
- l = new Label( def, TQT_TQIODEVICE(buffer), m_name, m_paintDevice, m_customer,
+ l = new Label( def, buffer, m_name, m_paintDevice, m_customer,
(*m_data)[m_cur_data_count].article_no, (*m_data)[m_cur_data_count].group );
if( number )
*number = (*m_data)[m_cur_data_count].number;
}
else if( m_addrdata )
{
- l = new Label( def, TQT_TQIODEVICE(buffer), m_name, m_paintDevice );
+ l = new Label( def, buffer, m_name, m_paintDevice );
l->setAddressee( &((*m_addrdata)[m_cur_data_count]) );
}
@@ -278,7 +278,7 @@ void BatchPrinter::startImages()
Measurements measure = def->getMeasurements();
Label* l = NULL;
painter = new TQPainter();
- TQPixmap pixmap( (int)measure.width( TQT_TQPAINTDEVICE(parent) ), (int)measure.height( TQT_TQPAINTDEVICE(parent) ) );
+ TQPixmap pixmap( (int)measure.width( parent ), (int)measure.height( parent ) );
while( (l = initLabel( &number ) ) != NULL )
{
for( int i = 0; i < number; i++ )
@@ -424,8 +424,8 @@ void BatchPrinter::drawBorders()
if( PrinterSettings::getInstance()->getData()->border ) {
painter->setPen( TQPen( TQt::black, 1 ) );
painter->drawRect( (int)curw, (int)curh,
- (int)m_measure.width( TQT_TQPAINTDEVICE(painter->device()) ),
- (int)m_measure.height( TQT_TQPAINTDEVICE(painter->device()) ) );
+ (int)m_measure.width( painter->device() ),
+ (int)m_measure.height( painter->device() ) );
}
}
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index 09c2fe4..13c41fc 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -134,7 +134,7 @@ void BatchWizard::setupPage1()
addPage( page1, i18n("File Selection") );
- connect( m_url, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
+ connect( m_url, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
}
void BatchWizard::setupPage2()
@@ -154,10 +154,10 @@ void BatchWizard::setupPage2()
pageLayout->addWidget( group );
pageLayout->addItem( spacer );
- connect( radioSimple, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioSqlArticles, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioVarImport, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioAddressBook, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( radioSimple, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioSqlArticles, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioVarImport, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioAddressBook, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
addPage( page2, i18n("Data Source") );
}
@@ -193,13 +193,13 @@ void BatchWizard::setupPage4()
addPage( page4, i18n("Import Variables") );
- connect( buttonTableInsert, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTableInsert() ) );
- connect( buttonTableRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTableRemove() ) );
+ connect( buttonTableInsert, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTableInsert() ) );
+ connect( buttonTableRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTableRemove() ) );
}
void BatchWizard::setupPage5()
{
- TokenProvider serial( TQT_TQPAINTDEVICE(this) );
+ TokenProvider serial( this );
page5 = new TQVBox( this, "page5" );
@@ -274,15 +274,15 @@ void BatchWizard::setupPage10()
pageLayout->addWidget( labelInfo );
pageLayout->addWidget( checkKeepOpen );
- connect( radioPrinter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioImage, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioBarcode, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( radioPrinter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioImage, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioBarcode, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
- connect( radioImageFilenameArticle, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioImageFilenameBarcode, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioImageFilenameCustom, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( radioImageFilenameArticle, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioImageFilenameBarcode, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioImageFilenameCustom, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
- connect( imageDirPath, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
+ connect( imageDirPath, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
addPage( page10, i18n("Output Device") );
}
@@ -309,9 +309,9 @@ void BatchWizard::setupStackPage1()
buttonRemoveAll = new KPushButton( i18n("R&emove All"), hButtonBox );
TDEPopupMenu* mnuImport = new TDEPopupMenu( this );
- mnuImport->insertItem( i18n("Import from File ..."), this, TQT_SLOT( loadFromFile() ) );
- mnuImport->insertItem( i18n("Import from Clipboard ..."), this, TQT_SLOT( loadFromClipboard() ) );
- mnuImport->insertItem( i18n("Import barcode_basic"), this, TQT_SLOT( addAllItems() ) );
+ mnuImport->insertItem( i18n("Import from File ..."), this, TQ_SLOT( loadFromFile() ) );
+ mnuImport->insertItem( i18n("Import from Clipboard ..."), this, TQ_SLOT( loadFromClipboard() ) );
+ mnuImport->insertItem( i18n("Import barcode_basic"), this, TQ_SLOT( addAllItems() ) );
buttonImport->setPopup( mnuImport );
sqlList = new TDEListView( stack1 );
@@ -320,16 +320,16 @@ void BatchWizard::setupStackPage1()
sqlList->addColumn( i18n("Article Number") );
sqlList->addColumn( i18n("Group") );
sqlList->setAllColumnsShowFocus( true );
- connect( sqlList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)),
- this, TQT_SLOT(changeItem(TQListViewItem*,const TQPoint &,int)));
+ connect( sqlList, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)),
+ this, TQ_SLOT(changeItem(TQListViewItem*,const TQPoint &,int)));
- connect( customerName, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerNameChanged(int) ) );
- connect( customerId, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerIdChanged(int) ) );
- connect( buttonAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addItem() ) );
- connect( buttonEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( editItem() ) );
- connect( buttonRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeItem() ) );
- connect( buttonRemoveAll, TQT_SIGNAL( clicked() ), sqlList, TQT_SLOT( clear() ) );
- connect( buttonRemoveAll, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( customerName, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerNameChanged(int) ) );
+ connect( customerId, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerIdChanged(int) ) );
+ connect( buttonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addItem() ) );
+ connect( buttonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( editItem() ) );
+ connect( buttonRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeItem() ) );
+ connect( buttonRemoveAll, TQ_SIGNAL( clicked() ), sqlList, TQ_SLOT( clear() ) );
+ connect( buttonRemoveAll, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
page3->addWidget( stack1 );
}
@@ -362,11 +362,11 @@ void BatchWizard::setupStackPage2()
new TQLabel( i18n("Available Variables:"), box );
m_varList = new TDEListBox( box );
- connect( radioImportManual, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioImportSql, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioImportCSV, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( importSqlQuery, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
- connect( importCsvFile, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
+ connect( radioImportManual, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioImportSql, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioImportCSV, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( importSqlQuery, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
+ connect( importCsvFile, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
page3->addWidget( stack2 );
}
@@ -452,10 +452,10 @@ void BatchWizard::setupStackPage4()
listSelectedAddress->setColumnWidthMode( 1, TQListView::Maximum );
listSelectedAddress->setColumnWidthMode( 2, TQListView::Maximum );
- connect( buttonAddAddress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAddress() ) );
- connect( buttonRemoveAddress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveAddress() ) );
- connect( buttonAddAllAddress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAllAddress() ) );
- connect( buttonRemoveAllAddress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveAllAddress() ) );
+ connect( buttonAddAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAddress() ) );
+ connect( buttonRemoveAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveAddress() ) );
+ connect( buttonAddAllAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAllAddress() ) );
+ connect( buttonRemoveAllAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveAllAddress() ) );
page3->addWidget( stack4 );
}
@@ -725,8 +725,8 @@ void BatchWizard::addItem()
{
DSSmallDialogs::AddItemsDialog aid( this, "aid" );
aid.setGroupCompletion( compGroup );
- connect( &aid, TQT_SIGNAL( add( const TQString &, const TQString &, int) ),
- this, TQT_SLOT( slotAddItem( const TQString &, const TQString &, int) ) );
+ connect( &aid, TQ_SIGNAL( add( const TQString &, const TQString &, int) ),
+ this, TQ_SLOT( slotAddItem( const TQString &, const TQString &, int) ) );
aid.exec();
}
@@ -999,9 +999,8 @@ void BatchWizard::fillVarList()
XMLUtils util;
DocumentItemList list;
- list.setAutoDelete( true );
- TokenProvider token( TQT_TQPAINTDEVICE(this) );
+ TokenProvider token( this );
Definition* def = NULL;
TQString description;
@@ -1017,8 +1016,8 @@ void BatchWizard::fillVarList()
m_varTable->setNumCols( vars.count() );
for( unsigned int i = 0; i < vars.count(); i++ )
{
- vars[i] = vars[i].right( vars[i].length() - 1 );
- m_varTable->horizontalHeader()->setLabel( i, vars[i] );
+ vars[i] = vars[i].right( vars[i].length() - 1 );
+ m_varTable->horizontalHeader()->setLabel( i, vars[i] );
}
delete def;
diff --git a/kbarcode/batchwizard.h b/kbarcode/batchwizard.h
index 1534022..e356e30 100644
--- a/kbarcode/batchwizard.h
+++ b/kbarcode/batchwizard.h
@@ -42,7 +42,7 @@ class TQVBox;
class TQWidgetStack;
class BatchWizard : public KWizard, public BatchIface {
- Q_OBJECT
+ TQ_OBJECT
public:
BatchWizard( TQWidget* parent = NULL, const char* name = NULL );
diff --git a/kbarcode/commands.cpp b/kbarcode/commands.cpp
index ea1c790..cf9c761 100644
--- a/kbarcode/commands.cpp
+++ b/kbarcode/commands.cpp
@@ -59,7 +59,7 @@ CommandUtils::CommandUtils(TCanvasItem* item)
c = m_canvas_item->canvas();
/* NOT NEEDED:
if( m_canvas_item && m_canvas_item->item() )
- connect( m_canvas_item->item(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( documentItemDeleted() ) );
+ connect( m_canvas_item->item(), TQ_SIGNAL( destroyed() ), this, TQ_SLOT( documentItemDeleted() ) );
*/
}
@@ -125,7 +125,7 @@ void NewItemCommand::execute()
m_item->addRef();
/* NOT NEEDED:
- connect( m_object, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( documentItemDeleted() ) );
+ connect( m_object, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( documentItemDeleted() ) );
*/
}
}
@@ -506,7 +506,7 @@ DeleteCommand::~DeleteCommand()
{
DocumentItem* item = m_canvas_item->item();
if( item )
- item->disconnect( item, TQT_SIGNAL( destroyed() ), this, 0 );
+ item->disconnect( item, TQ_SIGNAL( destroyed() ), this, 0 );
delete m_canvas_item;
}
}
diff --git a/kbarcode/commands.h b/kbarcode/commands.h
index 62b2f4e..7322360 100644
--- a/kbarcode/commands.h
+++ b/kbarcode/commands.h
@@ -53,7 +53,7 @@ class TokenProvider;
// Stuff for undo redo
class CommandUtils : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
CommandUtils(TCanvasItem* item);
@@ -81,7 +81,7 @@ class CommandUtils : public TQObject {
* @author Dominik Seichter
*/
class NewItemCommand : public TQObject, public KCommand {
- Q_OBJECT
+ TQ_OBJECT
public:
NewItemCommand( MyCanvasView* view, const TQString & name );
diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp
index 3dd0ab4..51b0d0a 100644
--- a/kbarcode/configdialog.cpp
+++ b/kbarcode/configdialog.cpp
@@ -192,7 +192,7 @@ void ConfigDialog::setupTab4()
date = new KLineEdit( box );
labelDate = new TQLabel( box );
- connect( date, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateDatePreview() ) );
+ connect( date, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateDatePreview() ) );
spinGrid = new KIntNumInput( 0, box );
spinGrid->setLabel( i18n("Grid:" ), AlignLeft | AlignVCenter );
@@ -217,7 +217,7 @@ void ConfigDialog::setupTab5()
TQVBoxLayout* tabLayout = new TQVBoxLayout( box, 11, 6 );
TQButtonGroup* bg = new TQButtonGroup( i18n("On New Article"), box );
- bg->setColumnLayout(0, Qt::Vertical );
+ bg->setColumnLayout(0, TQt::Vertical );
bg->layout()->setSpacing( 6 );
bg->layout()->setMargin( 11 );
TQGridLayout* bgLayout = new TQGridLayout( bg->layout() );
@@ -258,7 +258,7 @@ void ConfigDialog::setupTab5()
bgLayout->addWidget( onNewArticle4, 3, 1 );
TQButtonGroup* bg2 = new TQButtonGroup( i18n("On New Group"), box );
- bg2->setColumnLayout(0, Qt::Vertical );
+ bg2->setColumnLayout(0, TQt::Vertical );
bg2->layout()->setSpacing( 6 );
bg2->layout()->setMargin( 11 );
TQGridLayout* bg2Layout = new TQGridLayout( bg2->layout() );
diff --git a/kbarcode/configdialog.h b/kbarcode/configdialog.h
index d70d6fa..067c4e5 100644
--- a/kbarcode/configdialog.h
+++ b/kbarcode/configdialog.h
@@ -38,7 +38,7 @@ class SqlWidget;
*/
class ConfigDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
ConfigDialog( TQWidget* parent );
diff --git a/kbarcode/confwizard.cpp b/kbarcode/confwizard.cpp
index f5e89e7..2d7631c 100644
--- a/kbarcode/confwizard.cpp
+++ b/kbarcode/confwizard.cpp
@@ -66,9 +66,9 @@ ConfWizard::ConfWizard( TQWidget* parent, const char* name, bool modal )
setNextEnabled( page_2, false );
helpButton()->hide();
- connect( buttonCreate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( create() ) );
- connect( buttonExample, TQT_SIGNAL( clicked() ), this, TQT_SLOT( example() ) );
- connect( checkDatabase, TQT_SIGNAL( clicked() ), this, TQT_SLOT( useDatabase() ) );
+ connect( buttonCreate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( create() ) );
+ connect( buttonExample, TQ_SIGNAL( clicked() ), this, TQ_SLOT( example() ) );
+ connect( checkDatabase, TQ_SIGNAL( clicked() ), this, TQ_SLOT( useDatabase() ) );
}
ConfWizard::~ConfWizard()
@@ -134,7 +134,7 @@ void ConfWizard::setupPage2()
checkDatabase->setChecked( true );
sqlwidget = new SqlWidget( true, page_2, "sqlwidget" );
- connect( sqlwidget, TQT_SIGNAL( databaseWorking( bool ) ), this, TQT_SLOT( testSettings( bool ) ) );
+ connect( sqlwidget, TQ_SIGNAL( databaseWorking( bool ) ), this, TQ_SLOT( testSettings( bool ) ) );
TQSpacerItem* spacer_5 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
pageLayout_2->addWidget( checkDatabase );
diff --git a/kbarcode/confwizard.h b/kbarcode/confwizard.h
index 736a96a..c9eaffa 100644
--- a/kbarcode/confwizard.h
+++ b/kbarcode/confwizard.h
@@ -37,7 +37,7 @@ class SqlWidget;
*/
class ConfWizard : public KWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kbarcode/csvfile.cpp b/kbarcode/csvfile.cpp
index 960b4dd..5d138d8 100644
--- a/kbarcode/csvfile.cpp
+++ b/kbarcode/csvfile.cpp
@@ -35,7 +35,7 @@ CSVFile::CSVFile( const TQString & filename )
m_file.open( IO_ReadOnly );
if( m_file.isOpen() )
- m_stream.setDevice( TQT_TQIODEVICE(&m_file) );
+ m_stream.setDevice( &m_file );
}
CSVFile::CSVFile( TQBuffer & buf )
@@ -50,7 +50,7 @@ CSVFile::CSVFile( TQBuffer & buf )
buf.open( IO_ReadOnly );
if( buf.isOpen() )
- m_stream.setDevice( TQT_TQIODEVICE(&buf) );
+ m_stream.setDevice( &buf );
}
CSVFile::~CSVFile()
diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
index f9ff561..00e9b57 100644
--- a/kbarcode/csvimportdlg.cpp
+++ b/kbarcode/csvimportdlg.cpp
@@ -63,20 +63,20 @@ CSVImportDlg::CSVImportDlg(TQWidget *parent, const char *name )
createPage1();
createPage2();
- connect( requester, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( settingsChanged() ) );
- connect( buttonSet, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setCol() ) );
- connect( comboSQL, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( updateFields() ) );
- connect( databaseName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateFields() ) );
- connect( comboEncoding, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( settingsChanged() ) );
- connect( table->horizontalHeader(), TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( updateCol( int ) ) );
- connect( radioCSVFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioFixedFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( buttonAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addWidth() ) );
- connect( buttonRemove,TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeWidth() ) );
- connect( comment, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( settingsChanged() ) );
- connect( quote, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( settingsChanged() ) );
- connect( separator, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( settingsChanged() ) );
- connect( checkLoadAll, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( requester, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( settingsChanged() ) );
+ connect( buttonSet, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setCol() ) );
+ connect( comboSQL, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( updateFields() ) );
+ connect( databaseName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateFields() ) );
+ connect( comboEncoding, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( settingsChanged() ) );
+ connect( table->horizontalHeader(), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( updateCol( int ) ) );
+ connect( radioCSVFile, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioFixedFile, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( buttonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addWidth() ) );
+ connect( buttonRemove,TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeWidth() ) );
+ connect( comment, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( settingsChanged() ) );
+ connect( quote, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( settingsChanged() ) );
+ connect( separator, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( settingsChanged() ) );
+ connect( checkLoadAll, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
updateFields();
enableControls();
@@ -162,7 +162,7 @@ void CSVImportDlg::createPage2()
groupCSV = new TQGroupBox( i18n("CSV File"), hboxFrame );
groupFixed = new TQGroupBox( i18n("Fixed Field Width File"), hboxFrame );
- groupCSV->setColumnLayout(0, Qt::Vertical );
+ groupCSV->setColumnLayout(0, TQt::Vertical );
groupCSV->layout()->setSpacing( 6 );
groupCSV->layout()->setMargin( 11 );
@@ -195,7 +195,7 @@ void CSVImportDlg::createPage2()
vbox->addLayout( grid );
vbox->addItem( spacer1 );
- groupFixed->setColumnLayout(0, Qt::Horizontal );
+ groupFixed->setColumnLayout(0, TQt::Horizontal );
groupFixed->layout()->setSpacing( 6 );
groupFixed->layout()->setMargin( 11 );
TQHBoxLayout* groupFixedLayout = new TQHBoxLayout( groupFixed->layout() );
diff --git a/kbarcode/csvimportdlg.h b/kbarcode/csvimportdlg.h
index 8c884d5..1ad7857 100644
--- a/kbarcode/csvimportdlg.h
+++ b/kbarcode/csvimportdlg.h
@@ -45,7 +45,7 @@ class TQRadioButton;
* @author Dominik Seichter
*/
class CSVImportDlg : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
CSVImportDlg(TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/databasebrowser.cpp b/kbarcode/databasebrowser.cpp
index e3956ac..649c348 100644
--- a/kbarcode/databasebrowser.cpp
+++ b/kbarcode/databasebrowser.cpp
@@ -49,10 +49,10 @@ DatabaseBrowser::DatabaseBrowser( TQString _database, TQWidget *parent, const ch
database = _database;
- connect( table, TQT_SIGNAL( cursorChanged( TQSql::Op ) ),
- SqlTables::getInstance(), TQT_SIGNAL( tablesChanged() ) );
+ connect( table, TQ_SIGNAL( cursorChanged( TQSql::Op ) ),
+ SqlTables::getInstance(), TQ_SIGNAL( tablesChanged() ) );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL( connectedSQL() ), this, TQT_SLOT( setupSql() ) );
+ connect( this, TQ_SIGNAL( connectedSQL() ), this, TQ_SLOT( setupSql() ) );
findDlg = 0;
@@ -81,10 +81,10 @@ void DatabaseBrowser::setupActions()
DSMainWindow::setupActions();
TDEPopupMenu* editMenu = new TDEPopupMenu( this );
- TDEAction* acut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( cut() ), actionCollection() );
- TDEAction* acopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), actionCollection() );
- TDEAction* apaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( paste() ), actionCollection() );
- TDEAction* afind = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( find() ), actionCollection() );
+ TDEAction* acut = KStdAction::cut( this, TQ_SLOT( cut() ), actionCollection() );
+ TDEAction* acopy = KStdAction::copy( this, TQ_SLOT( copy() ), actionCollection() );
+ TDEAction* apaste = KStdAction::paste( this, TQ_SLOT( paste() ), actionCollection() );
+ TDEAction* afind = KStdAction::find( this, TQ_SLOT( find() ), actionCollection() );
menuBar()->insertItem( i18n("&Edit"), editMenu, -1, 1 );
acut->plug( editMenu );
@@ -93,10 +93,10 @@ void DatabaseBrowser::setupActions()
editMenu->insertSeparator();
afind->plug( editMenu );
- KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( findNext() ), actionCollection() )->plug( editMenu );
+ KStdAction::findNext( this, TQ_SLOT( findNext() ), actionCollection() )->plug( editMenu );
editMenu->insertSeparator();
TDEAction* aimport = new TDEAction( i18n("&Import CSV File..."), "",
- 0, TQT_TQOBJECT(this), TQT_SLOT(import()), actionCollection(), "import" );
+ 0, this, TQ_SLOT(import()), actionCollection(), "import" );
aimport->plug( editMenu );
acut->plug( toolBar() );
@@ -141,7 +141,7 @@ void DatabaseBrowser::find()
findDlg->setText( m_find );
findDlg->setDirection( m_direction );
findDlg->setCaseSensitive( m_case );
- connect( findDlg, TQT_SIGNAL( search() ), this, TQT_SLOT( findNext() ) );
+ connect( findDlg, TQ_SIGNAL( search() ), this, TQ_SLOT( findNext() ) );
findDlg->exec();
diff --git a/kbarcode/databasebrowser.h b/kbarcode/databasebrowser.h
index d6230f5..198ae26 100644
--- a/kbarcode/databasebrowser.h
+++ b/kbarcode/databasebrowser.h
@@ -31,7 +31,7 @@ class MyDataTable;
* and is mostly used for having a quick look on the tables.
*/
class DatabaseBrowser : public DSMainWindow{
- Q_OBJECT
+ TQ_OBJECT
public:
DatabaseBrowser( TQString _database, TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/definitiondialog.cpp b/kbarcode/definitiondialog.cpp
index f06fe9c..35a5e03 100644
--- a/kbarcode/definitiondialog.cpp
+++ b/kbarcode/definitiondialog.cpp
@@ -207,19 +207,19 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent, const char* name, bool mo
l = new TQLabel( this );
setExtension( l );
- setOrientation(Qt::Vertical );
+ setOrientation(TQt::Vertical );
- connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
- connect( buttonAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( add() ) );
+ connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
+ connect( buttonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( add() ) );
- connect( editWidth, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
- connect( editHeight, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
- connect( editHGap, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
- connect( editVGap, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
- connect( editTGap, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
- connect( editLGap, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
- connect( editNumH, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
- connect( editNumV, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
+ connect( editWidth, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+ connect( editHeight, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+ connect( editHGap, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+ connect( editVGap, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+ connect( editTGap, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+ connect( editLGap, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+ connect( editNumH, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+ connect( editNumV, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
comboProducer->setInsertionPolicy( TQComboBox::NoInsertion );
comboType->setInsertionPolicy( TQComboBox::NoInsertion );
@@ -232,9 +232,9 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent, const char* name, bool mo
for( unsigned int i = 0; i < list.count(); i++ )
types[i] = Definition::getTypes( list[i] );
- connect( comboProducer, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updateType() ) );
- connect( comboType, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updateText() ) );
- connect( buttonInfo, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleExtension() ) );
+ connect( comboProducer, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updateType() ) );
+ connect( comboType, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updateText() ) );
+ connect( buttonInfo, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleExtension() ) );
drawGraphic();
updateType();
diff --git a/kbarcode/definitiondialog.h b/kbarcode/definitiondialog.h
index b8f8e70..cc94c0c 100644
--- a/kbarcode/definitiondialog.h
+++ b/kbarcode/definitiondialog.h
@@ -20,7 +20,7 @@ class TQPaintEvent;
* The labels are drawn using TQPainter. Only one page is previewed.
*/
class LabelPreview : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
LabelPreview( TQWidget* parent = 0, const char* name = 0 );
@@ -44,7 +44,7 @@ class LabelPreview : public TQWidget {
*/
class DefinitionDialog : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kbarcode/documentitem.cpp b/kbarcode/documentitem.cpp
index 03f83e8..ba0f034 100644
--- a/kbarcode/documentitem.cpp
+++ b/kbarcode/documentitem.cpp
@@ -37,7 +37,7 @@ void DocumentItem::init()
{
m_canvasitem = NULL;
m_token = NULL;
- m_device = TQT_TQPAINTDEVICE(TDEApplication::desktop());
+ m_device = TDEApplication::desktop();
m_z = 0;
m_border = true;
@@ -67,7 +67,7 @@ void DocumentItem::loadXML (TQDomElement* element)
m_rect.setHeight( element->attribute( "height_mm", "-1" ).toInt() );
m_pen.setColor( readXMLColor( element, "line-color", TQt::black ) );
- m_pen.setStyle( (Qt::PenStyle)element->attribute( "line-style", "0" ).toInt() );
+ m_pen.setStyle( (TQt::PenStyle)element->attribute( "line-style", "0" ).toInt() );
m_pen.setWidth( element->attribute( "line-width", "1" ).toInt() );
m_border = (bool)element->attribute( "line-visible", "1" ).toInt();
m_z = element->attribute( "z", "0" ).toInt();
diff --git a/kbarcode/documentitem.h b/kbarcode/documentitem.h
index d1891b1..642c385 100644
--- a/kbarcode/documentitem.h
+++ b/kbarcode/documentitem.h
@@ -20,7 +20,6 @@
#include <xmlutils.h>
#include <tqobject.h>
-#include <tqsortedlist.h>
#include <tqstring.h>
#include <tqtextstream.h>
@@ -224,7 +223,5 @@ const TQString DocumentItem::visibilityScript() const
return m_visibilityScript;
}
-typedef TQSortedList<DocumentItem> DocumentItemList;
-
#endif //DOCUMENTITEM_H
diff --git a/kbarcode/documentitemdlg.cpp b/kbarcode/documentitemdlg.cpp
index 672273b..0a3f245 100644
--- a/kbarcode/documentitemdlg.cpp
+++ b/kbarcode/documentitemdlg.cpp
@@ -29,7 +29,6 @@ DocumentItemDlg::DocumentItemDlg( TokenProvider* token, DocumentItem* item, KCom
{
m_item = item;
m_history = history;
- //m_list.setAutoDelete( false );
TQVBox* boxBorder = addVBoxPage(i18n("&Position && Size"), TQString(), TQPixmap() );
addPage( new PropertySize( boxBorder ) );
diff --git a/kbarcode/documentitemdlg.h b/kbarcode/documentitemdlg.h
index e92f239..48c641d 100644
--- a/kbarcode/documentitemdlg.h
+++ b/kbarcode/documentitemdlg.h
@@ -27,7 +27,7 @@ class KCommandHistory;
class DocumentItemDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
DocumentItemDlg( TokenProvider* token, DocumentItem* item, KCommandHistory* history, TQWidget* parent );
diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp
index 0510f3d..ae826fa 100644
--- a/kbarcode/dsmainwindow.cpp
+++ b/kbarcode/dsmainwindow.cpp
@@ -50,7 +50,7 @@ DSMainWindow::DSMainWindow(TQWidget *parent, const char *name, WFlags f)
loadConfig();
setAutoSaveSettings( TQString("Window") + name, true );
- connect( kapp, TQT_SIGNAL( aboutToQuit() ), TQT_TQOBJECT(this), TQT_SLOT( saveConfig() ) );
+ connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
if( first && startwizard ) {
wizard();
@@ -65,24 +65,24 @@ DSMainWindow::~DSMainWindow()
void DSMainWindow::setupActions()
{
- TDEAction* quitAct = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
- TDEAction* closeAct = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "close" );
- TDEAction* configureAct = KStdAction::preferences( KBarcodeSettings::getInstance(), TQT_SLOT(configure()), actionCollection() );
- TDEAction* wizardAct = new TDEAction( i18n("&Start Configuration Wizard..."), BarIcon("wizard"), 0, TQT_TQOBJECT(this),
- TQT_SLOT(wizard()), actionCollection(), "wizard" );
+ TDEAction* quitAct = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ TDEAction* closeAct = KStdAction::close( this, TQ_SLOT( close() ), actionCollection(), "close" );
+ TDEAction* configureAct = KStdAction::preferences( KBarcodeSettings::getInstance(), TQ_SLOT(configure()), actionCollection() );
+ TDEAction* wizardAct = new TDEAction( i18n("&Start Configuration Wizard..."), BarIcon("wizard"), 0, this,
+ TQ_SLOT(wizard()), actionCollection(), "wizard" );
- connectAct = new TDEAction(i18n("&Connect to Database"), BarIcon("connect_no"), 0, TQT_TQOBJECT(this), TQT_SLOT(connectMySQL()),
+ connectAct = new TDEAction(i18n("&Connect to Database"), BarIcon("connect_no"), 0, this, TQ_SLOT(connectMySQL()),
actionCollection(),"connect" );
- TDEAction* newTablesAct = new TDEAction( i18n("&Create Tables"), "", 0, TQT_TQOBJECT(this),
- TQT_SLOT(newTables()), actionCollection(), "tables" );
+ TDEAction* newTablesAct = new TDEAction( i18n("&Create Tables"), "", 0, this,
+ TQ_SLOT(newTables()), actionCollection(), "tables" );
importLabelDefAct = new TDEAction( i18n("&Import Label Definitions"), "", 0, SqlTables::getInstance(),
- TQT_SLOT(importLabelDef()), actionCollection(), "import" );
+ TQ_SLOT(importLabelDef()), actionCollection(), "import" );
importExampleAct = new TDEAction( i18n("&Import Example Data"), "", 0, SqlTables::getInstance(),
- TQT_SLOT(importExampleData()), actionCollection(), "import" );
+ TQ_SLOT(importExampleData()), actionCollection(), "import" );
TDEPopupMenu* file = new TDEPopupMenu( this );
TDEPopupMenu* settings = new TDEPopupMenu( this );
@@ -90,12 +90,12 @@ void DSMainWindow::setupActions()
int helpid = hlpMenu->idAt( 0 );
hlpMenu->removeItem( helpid );
hlpMenu->insertItem( SmallIconSet("contents"), i18n("&Help"),
- this, TQT_SLOT(appHelpActivated()), Key_F1, -1, 0 );
- hlpMenu->insertItem( SmallIconSet("barcode"), i18n("&Barcode Help..."), this, TQT_SLOT( startInfo() ), 0, -1, 1 );
+ this, TQ_SLOT(appHelpActivated()), Key_F1, -1, 0 );
+ hlpMenu->insertItem( SmallIconSet("barcode"), i18n("&Barcode Help..."), this, TQ_SLOT( startInfo() ), 0, -1, 1 );
hlpMenu->insertSeparator(3);
- hlpMenu->insertItem( i18n("&Donate..."), this, TQT_SLOT( donations() ), 0, -1, 4 );
+ hlpMenu->insertItem( i18n("&Donate..."), this, TQ_SLOT( donations() ), 0, -1, 4 );
hlpMenu->insertSeparator(5);
- hlpMenu->insertItem( SmallIconSet("computer"), i18n("&System Check..."), this, TQT_SLOT(showCheck() ), 0, -1, 6 );
+ hlpMenu->insertItem( SmallIconSet("computer"), i18n("&System Check..."), this, TQ_SLOT(showCheck() ), 0, -1, 6 );
menuBar()->insertItem( i18n("&File"), file );
menuBar()->insertItem( i18n("&Settings"), settings );
menuBar()->insertItem( i18n("&Help"), hlpMenu );
@@ -106,7 +106,7 @@ void DSMainWindow::setupActions()
configureAct->plug( settings );
wizardAct->plug( settings );
connectAct->plug( settings );
- (new TDEActionSeparator( TQT_TQOBJECT(this) ))->plug( settings );
+ (new TDEActionSeparator( this ))->plug( settings );
newTablesAct->plug( settings );
importLabelDefAct->plug( settings );
importExampleAct->plug( settings );
diff --git a/kbarcode/dsmainwindow.h b/kbarcode/dsmainwindow.h
index 94e342b..df011b2 100644
--- a/kbarcode/dsmainwindow.h
+++ b/kbarcode/dsmainwindow.h
@@ -31,7 +31,7 @@ class TDEPopupMenu;
* @author Dominik Seichter
*/
class DSMainWindow : public TDEMainWindow {
- Q_OBJECT
+ TQ_OBJECT
public:
DSMainWindow(TQWidget *parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose );
diff --git a/kbarcode/dstextedit.cpp b/kbarcode/dstextedit.cpp
index 9a51d8f..88c5e0f 100644
--- a/kbarcode/dstextedit.cpp
+++ b/kbarcode/dstextedit.cpp
@@ -22,7 +22,7 @@
DSTextEdit::DSTextEdit( TQWidget* parent, const char* name )
: KTextEdit( parent, name )
{
- connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( fixParagraphs() ) );
+ connect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( fixParagraphs() ) );
}
void DSTextEdit::fixParagraphs()
@@ -46,7 +46,7 @@ void DSTextEdit::fixParagraphs()
chars.append( paragraphLength( i ) );
// disconnect us first as we change the text here
- disconnect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( fixParagraphs() ) );
+ disconnect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( fixParagraphs() ) );
getCursorPosition( &para, &index );
getSelection( &paraFrom, &indexFrom, &paraTo, &indexTo );
@@ -105,7 +105,7 @@ void DSTextEdit::fixParagraphs()
this->setSelection( paraFrom, indexFrom, paraTo, indexTo );
- connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( fixParagraphs() ) );
+ connect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( fixParagraphs() ) );
}
/*
diff --git a/kbarcode/dstextedit.h b/kbarcode/dstextedit.h
index 75a0903..e912c3c 100644
--- a/kbarcode/dstextedit.h
+++ b/kbarcode/dstextedit.h
@@ -26,7 +26,7 @@
#define TextEditBase KTextEdit
class DSTextEdit : public KTextEdit {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kbarcode/encodingcombo.h b/kbarcode/encodingcombo.h
index 015b016..b86bdd3 100644
--- a/kbarcode/encodingcombo.h
+++ b/kbarcode/encodingcombo.h
@@ -21,7 +21,7 @@
#include <kcombobox.h>
class EncodingCombo : public KComboBox {
- Q_OBJECT
+ TQ_OBJECT
public:
EncodingCombo( TQWidget* parent );
diff --git a/kbarcode/imageitem.cpp b/kbarcode/imageitem.cpp
index eb1b7e5..d5ff362 100644
--- a/kbarcode/imageitem.cpp
+++ b/kbarcode/imageitem.cpp
@@ -225,10 +225,10 @@ void ImageItem::createImage()
{
if( DocumentItem::paintDevice()->isExtDev() )
img = img.smoothScale( rect().width(), rect().height(),
- (m_scaling == eImage_Scaled ? TQ_ScaleMin : TQ_ScaleFree) );
+ (m_scaling == eImage_Scaled ? TQImage::ScaleMin : TQImage::ScaleFree) );
else
img = img.scale( rect().width(), rect().height(),
- (m_scaling == eImage_Scaled ? TQ_ScaleMin : TQ_ScaleFree) );
+ (m_scaling == eImage_Scaled ? TQImage::ScaleMin : TQImage::ScaleFree) );
}
else
{
@@ -239,7 +239,7 @@ void ImageItem::createImage()
img = img.smoothScale( (int)(img.width() * ((double)metrics.logicalDpiX()/TQPaintDevice::x11AppDpiX())),
(int)(img.height() * ((double)metrics.logicalDpiY()/TQPaintDevice::x11AppDpiY())),
- TQ_ScaleMin );
+ TQImage::ScaleMin );
}
}
diff --git a/kbarcode/kbarcode-batch.desktop b/kbarcode/kbarcode-batch.desktop
index f6bc30e..2119f0e 100644
--- a/kbarcode/kbarcode-batch.desktop
+++ b/kbarcode/kbarcode-batch.desktop
@@ -4,10 +4,8 @@ Type=Application
Exec=kbarcode --batch
Icon=kbarcode
Comment=Barcode and label printing tool (batch printing mode)
-Comment[de]=Werkzeug zum Barcode und Etiketten Druck (Stapelverarbeitung)
Terminal=false
Name=KBarcode Batch Printer
-Name[de]=KBarcode Batch Druck
GenericName=Barcode and Label Batch Printer
Categories=Qt;TDE;Office;
NoDisplay=true
diff --git a/kbarcode/kbarcode-editor.desktop b/kbarcode/kbarcode-editor.desktop
index ff48ff5..554b287 100644
--- a/kbarcode/kbarcode-editor.desktop
+++ b/kbarcode/kbarcode-editor.desktop
@@ -4,10 +4,8 @@ Type=Application
Exec=kbarcode --label
Icon=kbarcode
Comment=Barcode and label printing tool editor
-Comment[de]=Werkzeug zum Barcode und Etiketten Druck Editor
Terminal=false
Name=KBarcode Label Editor
-Name[de]=KBarcode Label Editor
GenericName=Barcode and Label Editor
Categories=Qt;TDE;Office;
NoDisplay=true
diff --git a/kbarcode/kbarcode-label.desktop b/kbarcode/kbarcode-label.desktop
index 08d8244..7e46010 100644
--- a/kbarcode/kbarcode-label.desktop
+++ b/kbarcode/kbarcode-label.desktop
@@ -5,7 +5,6 @@ Encoding=UTF-8
Icon=kbarcode
X-DocPath=kbarcode/index.html
MimeType=application/kbarcode-label
-Name[de]=kbarcode-label.desktop
GenericName=KBarcode Label
Patterns=*.kbarcode;*.KBARCODE;
NoDisplay=true
diff --git a/kbarcode/kbarcode-single.desktop b/kbarcode/kbarcode-single.desktop
index 090e0ab..9168fbd 100644
--- a/kbarcode/kbarcode-single.desktop
+++ b/kbarcode/kbarcode-single.desktop
@@ -4,10 +4,8 @@ Type=Application
Exec=kbarcode --barcode
Icon=kbarcode
Comment=Barcode generation tool
-Comment[de]=Barcode Erstellung
Terminal=0
Name=KBarcode Barcode Generator
-Name[de]=KBarcode Barcode Generator
GenericName=Barcode Generator
Categories=Qt;TDE;Office;
NoDisplay=true
diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp
index 2f864d4..70317fa 100644
--- a/kbarcode/kbarcode.cpp
+++ b/kbarcode/kbarcode.cpp
@@ -44,7 +44,7 @@ KBarcode::KBarcode( TQWidget *parent, const char *name, WFlags f)
DSMainWindow( parent, name, f )
{
TQGroupBox* w = new TQGroupBox( this );
- w->setColumnLayout(0, Qt::Vertical );
+ w->setColumnLayout(0, TQt::Vertical );
TQVBoxLayout* layout = new TQVBoxLayout( w->layout() );
setCentralWidget( w );
@@ -64,28 +64,28 @@ KBarcode::KBarcode( TQWidget *parent, const char *name, WFlags f)
layout->addWidget( buttonBatch );
layout->addWidget( buttonData );
- connect( buttonSingle, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startBarcode() ) );
- connect( buttonEditor, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startLabelEditor() ) );
- connect( buttonBatch, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startBatchPrint() ) );
- connect( SqlTables::getInstance(), TQT_SIGNAL( connectedSQL() ), TQT_TQOBJECT(this), TQT_SLOT( enableData() ) );
+ connect( buttonSingle, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startBarcode() ) );
+ connect( buttonEditor, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startLabelEditor() ) );
+ connect( buttonBatch, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startBatchPrint() ) );
+ connect( SqlTables::getInstance(), TQ_SIGNAL( connectedSQL() ), this, TQ_SLOT( enableData() ) );
setupActions();
show();
TDEAction* editLabelDefAct = new TDEAction(i18n("&Edit Label Definitions"), "",
- 0, TQT_TQOBJECT(this), TQT_SLOT(editLabelDef()), actionCollection(), "design" );
+ 0, this, TQ_SLOT(editLabelDef()), actionCollection(), "design" );
TDEAction* editArticleAct = new TDEAction(i18n("&Edit Articles"), "",
- 0, TQT_TQOBJECT(this), TQT_SLOT(editArticles()), actionCollection(), "design" );
+ 0, this, TQ_SLOT(editArticles()), actionCollection(), "design" );
TDEAction* editCustomerAct = new TDEAction(i18n("&Edit Customers"), "",
- 0, TQT_TQOBJECT(this), TQT_SLOT(editCustomers()), actionCollection(), "design" );
+ 0, this, TQ_SLOT(editCustomers()), actionCollection(), "design" );
TDEAction* editCustomerTextAct = new TDEAction(i18n("&Edit Customer Text"), "",
- 0, TQT_TQOBJECT(this), TQT_SLOT(editCustomerText()), actionCollection() );
+ 0, this, TQ_SLOT(editCustomerText()), actionCollection() );
TDEAction* importCSVAct = new TDEAction(i18n("&Import CSV File..."), "",
- 0, TQT_TQOBJECT(this), TQT_SLOT(importCSV()), actionCollection() );
+ 0, this, TQ_SLOT(importCSV()), actionCollection() );
TDEPopupMenu* data = new TDEPopupMenu( buttonData );
editLabelDefAct->plug( data );
diff --git a/kbarcode/kbarcode.desktop b/kbarcode/kbarcode.desktop
index 0d6374a..9d624b6 100644
--- a/kbarcode/kbarcode.desktop
+++ b/kbarcode/kbarcode.desktop
@@ -5,10 +5,12 @@ Exec=kbarcode -caption "%c" %i %m %f
Icon=kbarcode
MimeType=application/kbarcode-label
X-DocPath=kbarcode/index.html
-Comment=Barcode and label printing tool
-Comment[de]=Werkzeug zum Barcode und Etiketten Druck
Terminal=0
+
Name=KBarcode
-Name[de]=KBarcode
+
GenericName=Barcode and Label Printing
+
+Comment=Barcode and label printing tool
+
Categories=Qt;TDE;Office;
diff --git a/kbarcode/kbarcode.h b/kbarcode/kbarcode.h
index e9bd6e8..3c001ae 100644
--- a/kbarcode/kbarcode.h
+++ b/kbarcode/kbarcode.h
@@ -43,7 +43,7 @@ class KPushButton;
* There are also a few smaller modules.
*/
class KBarcode: public DSMainWindow, public KBarcodeIface {
- Q_OBJECT
+ TQ_OBJECT
public:
KBarcode( TQWidget *parent=0, const char *name="kbarcode", WFlags f = WType_TopLevel | WDestructiveClose );
diff --git a/kbarcode/kbarcodesettings.cpp b/kbarcode/kbarcodesettings.cpp
index b8d6684..39ad516 100644
--- a/kbarcode/kbarcodesettings.cpp
+++ b/kbarcode/kbarcodesettings.cpp
@@ -27,7 +27,7 @@
#include <klineedit.h>
#include <knuminput.h>
-// QT includes
+// TQt includes
#include <tqcheckbox.h>
KBarcodeSettings* KBarcodeSettings::m_instance = 0;
diff --git a/kbarcode/kbarcodesettings.h b/kbarcode/kbarcodesettings.h
index 4d1ea12..71f4c61 100644
--- a/kbarcode/kbarcodesettings.h
+++ b/kbarcode/kbarcodesettings.h
@@ -28,7 +28,7 @@
*/
class KBarcodeSettings : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
static KBarcodeSettings* getInstance();
diff --git a/kbarcode/label.cpp b/kbarcode/label.cpp
index b109347..552a969 100644
--- a/kbarcode/label.cpp
+++ b/kbarcode/label.cpp
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include <algorithm>
+
#include "label.h"
#include "measurements.h"
#include "kbarcode.h"
@@ -72,6 +74,13 @@ Label::Label( Definition* _def, TQIODevice* device, TQString labelname, TQPaintD
Label::~Label()
{
+ for (DocumentItem *item : m_list)
+ {
+ if (item)
+ {
+ delete item;
+ }
+ }
}
void Label::epcl( TQTextStream* stream )
@@ -79,7 +88,7 @@ void Label::epcl( TQTextStream* stream )
*stream << EPCLUtils::header();
DocumentItem* item;
- for( item = m_list.first();item;item=m_list.next())
+ for (DocumentItem *item : m_list)
if( drawThisItem( item ) )
item->drawEPcl( stream );
@@ -92,7 +101,7 @@ void Label::ipl( TQTextStream* stream )
*stream << utils.header();
DocumentItem* item;
- for( item = m_list.first();item;item=m_list.next())
+ for (DocumentItem *item : m_list)
if( drawThisItem( item ) )
item->drawIpl( stream, &utils );
@@ -105,7 +114,7 @@ void Label::zpl( TQTextStream* stream )
*stream << ZPLUtils::header();
DocumentItem* item;
- for( item = m_list.first();item;item=m_list.next())
+ for (DocumentItem *item : m_list)
if( drawThisItem( item ) )
item->drawZpl( stream );
@@ -117,7 +126,7 @@ void Label::InitBarcodes()
bool firstbarcode = true;
DocumentItem* item;
- for( item = m_list.first();item;item=m_list.next())
+ for (DocumentItem *item : m_list)
{
if( item->rtti() == eRtti_Barcode )
{
@@ -149,13 +158,13 @@ void Label::InitBarcodes()
void Label::draw( TQPainter* painter, int x, int y )
{
- TQSize label( (int)d->getMeasurements().width( TQT_TQPAINTDEVICE(painter->device()) ),
- (int)d->getMeasurements().height( TQT_TQPAINTDEVICE(painter->device()) ) );
+ TQSize label( (int)d->getMeasurements().width( painter->device() ),
+ (int)d->getMeasurements().height( painter->device() ) );
InitBarcodes();
DocumentItem* item;
- for( item = m_list.first();item;item=m_list.next())
+ for (DocumentItem *item : m_list)
if( drawThisItem( item ) )
{
// add x and y to clip coordinates
@@ -231,13 +240,12 @@ void Label::load( TQIODevice* device )
delete definition;
readDocumentItems( &m_list, &doc, NULL, kbarcode18 );
- m_list.setAutoDelete( true );
// sort the list by z index
- m_list.sort();
+ std::sort(m_list.begin(), m_list.end(), [](DocumentItem *a, DocumentItem *b) { return *a < *b; });
DocumentItem* item;
- for( item = m_list.first();item;item=m_list.next())
+ for (DocumentItem *item : m_list)
{
// set the paint device for all items
item->setPaintDevice( m_printer );
@@ -295,7 +303,7 @@ bool Label::drawThisItem( const DocumentItem* item )
bool Label::update()
{
DocumentItem* item;
- for( item = m_list.first();item;item=m_list.next())
+ for (DocumentItem *item : m_list)
if( !item->visibilityScript().isEmpty() && item->visibilityScript() != "true" )
return true;
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index 6471527..c7c3133 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -50,7 +50,7 @@
#include "textlineitem.h"
//NY34
-// QT includes
+// TQt includes
#include <tqbuffer.h>
#include <tqcanvas.h>
#include <tqcheckbox.h>
@@ -131,7 +131,7 @@ LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name
description = TQString();
d = new Definition();
- m_token = new TokenProvider( TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
+ m_token = new TokenProvider( TDEApplication::desktop() );
statusBar()->insertItem( "", STATUS_ID_TEMPLATE, 0, true );
statusBar()->insertItem( "", STATUS_ID_SIZE, 0, true );
@@ -139,7 +139,7 @@ LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name
statusBar()->setSizeGripEnabled( true );
statusBar()->show();
- c = new MyCanvas( TQT_TQOBJECT(this) );
+ c = new MyCanvas( this );
c->setDoubleBuffering( true );
c->setUpdatePeriod( CANVAS_UPDATE_PERIOD );
@@ -159,14 +159,14 @@ LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name
// if( isFirstStart() )
// moveDockWindow( tools, TQt::DockLeft );
- connect( cv, TQT_SIGNAL( doubleClickedItem(TCanvasItem*) ), TQT_TQOBJECT(this), TQT_SLOT( doubleClickedItem(TCanvasItem*) ) );
- connect( cv, TQT_SIGNAL( showContextMenu(TQPoint) ), TQT_TQOBJECT(this), TQT_SLOT( showContextMenu(TQPoint) ) );
- connect( cv, TQT_SIGNAL( movedSomething() ), TQT_TQOBJECT(this), TQT_SLOT( setEdited() ) );
- connect( KBarcodeSettings::getInstance(), TQT_SIGNAL( updateGrid( int ) ), cv, TQT_SLOT( updateGUI() ) );
- connect( kapp, TQT_SIGNAL( aboutToQuit() ), TQT_TQOBJECT(this), TQT_SLOT( saveConfig() ) );
+ connect( cv, TQ_SIGNAL( doubleClickedItem(TCanvasItem*) ), this, TQ_SLOT( doubleClickedItem(TCanvasItem*) ) );
+ connect( cv, TQ_SIGNAL( showContextMenu(TQPoint) ), this, TQ_SLOT( showContextMenu(TQPoint) ) );
+ connect( cv, TQ_SIGNAL( movedSomething() ), this, TQ_SLOT( setEdited() ) );
+ connect( KBarcodeSettings::getInstance(), TQ_SIGNAL( updateGrid( int ) ), cv, TQ_SLOT( updateGUI() ) );
+ connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
- connect( history, TQT_SIGNAL( commandExecuted() ), cv, TQT_SLOT( updateGUI() ) );
- connect( history, TQT_SIGNAL( commandExecuted() ), TQT_TQOBJECT(this), TQT_SLOT( setEdited() ) );
+ connect( history, TQ_SIGNAL( commandExecuted() ), cv, TQ_SLOT( updateGUI() ) );
+ connect( history, TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( setEdited() ) );
if( !_filename.isEmpty() )
openUrl( _filename );
@@ -247,8 +247,8 @@ void LabelEditor::clearLabel()
createCommandHistory();
createCommandHistoryActions();
- connect( history, TQT_SIGNAL( commandExecuted() ), cv, TQT_SLOT( updateGUI() ) );
- connect( history, TQT_SIGNAL( commandExecuted() ), TQT_TQOBJECT(this), TQT_SLOT( setEdited() ) );
+ connect( history, TQ_SIGNAL( commandExecuted() ), cv, TQ_SLOT( updateGUI() ) );
+ connect( history, TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( setEdited() ) );
m_edited = false;
@@ -303,7 +303,7 @@ bool LabelEditor::save( TQString name )
if ( !f.open( IO_WriteOnly ) )
return false;
- save( TQT_TQIODEVICE(&f) );
+ save( &f );
m_token->setLabelName( filename.right( filename.length() - filename.findRev( "/" ) - 1 ) );
// maybe we should redraw all items on the canvas now.
@@ -390,11 +390,11 @@ bool LabelEditor::openUrl( const TQString & url )
DocumentItemList list;
readDocumentItems( &list, &doc, m_token, kbarcode18 );
- for( unsigned int i=0;i<list.count();i++ )
+ for( unsigned int i=0;i<list.size();i++ )
{
TCanvasItem* citem = new TCanvasItem( cv );
citem->setItem( list.at( i ) );
- citem->addRef();
+ citem->addRef();
}
list.clear();
@@ -437,47 +437,47 @@ bool LabelEditor::newLabel()
void LabelEditor::setupActions()
{
- TDEAction* newAct = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(startEditor()), actionCollection() );
- TDEAction* loadAct = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(startLoadEditor()), actionCollection() );
- TDEAction* quitAct = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
- TDEAction* closeAct = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "close" );
- closeLabelAct = new TDEAction( i18n("Close &Label" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( closeLabel() ), actionCollection() );
-
- recentAct = new TDERecentFilesAction( i18n("&Recent Files"), 0, TQT_TQOBJECT(this), TQT_SLOT( loadRecentEditor( const KURL& ) ) );
-
- TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "document-print" ), 0, TQT_TQOBJECT(this), TQT_SLOT( batchPrint() ), actionCollection() );
-
- saveAct = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection(), "save" );
- saveAsAct = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveas() ), actionCollection(), "saveas" );
- descriptionAct = new TDEAction( i18n("&Change description..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(changeDes()), actionCollection() );
- deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("edit-delete") ), Key_Delete, TQT_TQOBJECT(cv), TQT_SLOT( deleteCurrent() ), actionCollection() );
- editPropAct = new TDEAction( i18n("&Properties..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( doubleClickedCurrent() ), actionCollection() );
- printAct = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(), "print" );
- bcpAct = new TDEAction( i18n("Print to &Barcode Printer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( printBCP() ), actionCollection() );
- imgAct = new TDEAction( i18n("Print to &Image..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(printImage() ), actionCollection() );
- changeSizeAct = new TDEAction( i18n("&Change Label..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( changeSize() ), actionCollection() );
- barcodeAct = new TDEAction( i18n("Insert &Barcode"), TQIconSet( BarIcon("barcode") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertBarcode() ), actionCollection() );
+ TDEAction* newAct = KStdAction::openNew( this, TQ_SLOT(startEditor()), actionCollection() );
+ TDEAction* loadAct = KStdAction::open( this, TQ_SLOT(startLoadEditor()), actionCollection() );
+ TDEAction* quitAct = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ TDEAction* closeAct = KStdAction::close( this, TQ_SLOT( close() ), actionCollection(), "close" );
+ closeLabelAct = new TDEAction( i18n("Close &Label" ), 0, 0, this, TQ_SLOT( closeLabel() ), actionCollection() );
+
+ recentAct = new TDERecentFilesAction( i18n("&Recent Files"), 0, this, TQ_SLOT( loadRecentEditor( const KURL& ) ) );
+
+ TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "document-print" ), 0, this, TQ_SLOT( batchPrint() ), actionCollection() );
+
+ saveAct = KStdAction::save( this, TQ_SLOT( save() ), actionCollection(), "save" );
+ saveAsAct = KStdAction::saveAs( this, TQ_SLOT( saveas() ), actionCollection(), "saveas" );
+ descriptionAct = new TDEAction( i18n("&Change description..."), 0, 0, this, TQ_SLOT(changeDes()), actionCollection() );
+ deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("edit-delete") ), Key_Delete, cv, TQ_SLOT( deleteCurrent() ), actionCollection() );
+ editPropAct = new TDEAction( i18n("&Properties..."), 0, 0, this, TQ_SLOT( doubleClickedCurrent() ), actionCollection() );
+ printAct = KStdAction::print( this, TQ_SLOT( print() ), actionCollection(), "print" );
+ bcpAct = new TDEAction( i18n("Print to &Barcode Printer..."), 0, 0, this, TQ_SLOT( printBCP() ), actionCollection() );
+ imgAct = new TDEAction( i18n("Print to &Image..."), 0, 0, this, TQ_SLOT(printImage() ), actionCollection() );
+ changeSizeAct = new TDEAction( i18n("&Change Label..."), 0, 0, this, TQ_SLOT( changeSize() ), actionCollection() );
+ barcodeAct = new TDEAction( i18n("Insert &Barcode"), TQIconSet( BarIcon("barcode") ), 0, this, TQ_SLOT( insertBarcode() ), actionCollection() );
barcodeAct->setEnabled( Barkode::haveBarcode() );
- pictureAct = new TDEAction( i18n("Insert &Picture"), TQIconSet( BarIcon("inline_image") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertPicture() ), actionCollection() );
- textAct = new TDEAction( i18n("Insert &Text"), TQIconSet( BarIcon("text") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertText() ), actionCollection() );
- textDataAct = new TDEAction( i18n("Insert &Data Field"), TQIconSet( BarIcon("contents") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertDataText() ), actionCollection() );
- textLineAct = new TDEAction( i18n("Insert &Text Line"), TQIconSet( BarIcon("text") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertTextLine() ), actionCollection() );
- lineAct = new TDEAction( i18n("Insert &Line"), TQIconSet( BarIcon("kbarcodelinetool") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertLine() ), actionCollection() );
- rectAct = new TDEAction( i18n("Insert &Rectangle"), TQIconSet( BarIcon("kbarcoderect") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertRect() ), actionCollection() );
- circleAct = new TDEAction( i18n("Insert &Ellipse"), TQIconSet( BarIcon("kbarcodeellipse") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertCircle() ), actionCollection() );
- spellAct = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT(spellCheck()), actionCollection(), "spell" );
- gridAct = new TDEToggleAction( i18n("&Grid"), TQIconSet( BarIcon("kbarcodegrid") ), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleGrid() ), actionCollection() );
- previewAct = new TDEAction( i18n("&Preview..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( preview() ), actionCollection() );
- sep = new TDEActionSeparator( TQT_TQOBJECT(this) );
- cutAct = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( cut() ), actionCollection(), "cut" );
- copyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), actionCollection(), "copy" );
- pasteAct = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( paste() ), actionCollection(), "paste" );
- selectAllAct = KStdAction::selectAll( TQT_TQOBJECT(cv), TQT_SLOT( selectAll() ), actionCollection(), "select_all" );
- deSelectAllAct = KStdAction::deselect( TQT_TQOBJECT(cv), TQT_SLOT( deSelectAll() ), actionCollection(), "de_select_all" );
- addressBookAct = new TDEAction( i18n("Address&book"), TQIconSet( BarIcon("kaddressbook") ), 0, TQT_TQOBJECT(this), TQT_SLOT( launchAddressBook() ), actionCollection() );
+ pictureAct = new TDEAction( i18n("Insert &Picture"), TQIconSet( BarIcon("inline_image") ), 0, this, TQ_SLOT( insertPicture() ), actionCollection() );
+ textAct = new TDEAction( i18n("Insert &Text"), TQIconSet( BarIcon("text") ), 0, this, TQ_SLOT( insertText() ), actionCollection() );
+ textDataAct = new TDEAction( i18n("Insert &Data Field"), TQIconSet( BarIcon("contents") ), 0, this, TQ_SLOT( insertDataText() ), actionCollection() );
+ textLineAct = new TDEAction( i18n("Insert &Text Line"), TQIconSet( BarIcon("text") ), 0, this, TQ_SLOT( insertTextLine() ), actionCollection() );
+ lineAct = new TDEAction( i18n("Insert &Line"), TQIconSet( BarIcon("kbarcodelinetool") ), 0, this, TQ_SLOT( insertLine() ), actionCollection() );
+ rectAct = new TDEAction( i18n("Insert &Rectangle"), TQIconSet( BarIcon("kbarcoderect") ), 0, this, TQ_SLOT( insertRect() ), actionCollection() );
+ circleAct = new TDEAction( i18n("Insert &Ellipse"), TQIconSet( BarIcon("kbarcodeellipse") ), 0, this, TQ_SLOT( insertCircle() ), actionCollection() );
+ spellAct = KStdAction::spelling( this, TQ_SLOT(spellCheck()), actionCollection(), "spell" );
+ gridAct = new TDEToggleAction( i18n("&Grid"), TQIconSet( BarIcon("kbarcodegrid") ), 0, this, TQ_SLOT( toggleGrid() ), actionCollection() );
+ previewAct = new TDEAction( i18n("&Preview..."), 0, 0, this, TQ_SLOT( preview() ), actionCollection() );
+ sep = new TDEActionSeparator( this );
+ cutAct = KStdAction::cut( this, TQ_SLOT( cut() ), actionCollection(), "cut" );
+ copyAct = KStdAction::copy( this, TQ_SLOT( copy() ), actionCollection(), "copy" );
+ pasteAct = KStdAction::paste( this, TQ_SLOT( paste() ), actionCollection(), "paste" );
+ selectAllAct = KStdAction::selectAll( cv, TQ_SLOT( selectAll() ), actionCollection(), "select_all" );
+ deSelectAllAct = KStdAction::deselect( cv, TQ_SLOT( deSelectAll() ), actionCollection(), "de_select_all" );
+ addressBookAct = new TDEAction( i18n("Address&book"), TQIconSet( BarIcon("kaddressbook") ), 0, this, TQ_SLOT( launchAddressBook() ), actionCollection() );
TDEAction* singleBarcodeAct = new TDEAction(i18n("&Create Single Barcode..."), "",
- 0, TQT_TQOBJECT(this), TQT_SLOT(startBarcodeGen()),
+ 0, this, TQ_SLOT(startBarcodeGen()),
actionCollection(), "create" );
singleBarcodeAct->setEnabled( Barkode::haveBarcode() );
@@ -500,12 +500,12 @@ void LabelEditor::setupActions()
lineAct->plug( tools );
rectAct->plug( tools );
circleAct->plug( tools );
- (new TDEActionSeparator( TQT_TQOBJECT(this) ))->plug( tools );
+ (new TDEActionSeparator( this ))->plug( tools );
// spellAct->plug( tools ); // KDE 3.2
gridAct->plug( tools );
DSMainWindow::setupActions();
- connect( recentAct, TQT_SIGNAL( urlSelected( const KURL& ) ), TQT_TQOBJECT(this), TQT_SLOT( startLoadRecentEditor( const KURL& ) ) );
+ connect( recentAct, TQ_SIGNAL( urlSelected( const KURL& ) ), this, TQ_SLOT( startLoadRecentEditor( const KURL& ) ) );
TDEPopupMenu* fileMenu = new TDEPopupMenu( this );
editMenu = new TDEPopupMenu( this );
@@ -579,22 +579,22 @@ void LabelEditor::setupContextMenu()
m_mnuContext->setCheckable( true );
TDEPopupMenu* orderMenu = new TDEPopupMenu( m_mnuContext );
- orderMenu->insertItem( i18n("&On Top"), TQT_TQOBJECT(this), TQT_SLOT( onTopCurrent() ) );
- orderMenu->insertItem( i18n("&Raise"), TQT_TQOBJECT(this), TQT_SLOT( raiseCurrent() ) );
- orderMenu->insertItem( i18n("&Lower"), TQT_TQOBJECT(this), TQT_SLOT( lowerCurrent() ) );
- orderMenu->insertItem( i18n("&To Background"), TQT_TQOBJECT(this), TQT_SLOT( backCurrent() ) );
+ orderMenu->insertItem( i18n("&On Top"), this, TQ_SLOT( onTopCurrent() ) );
+ orderMenu->insertItem( i18n("&Raise"), this, TQ_SLOT( raiseCurrent() ) );
+ orderMenu->insertItem( i18n("&Lower"), this, TQ_SLOT( lowerCurrent() ) );
+ orderMenu->insertItem( i18n("&To Background"), this, TQ_SLOT( backCurrent() ) );
TDEPopupMenu* centerMenu = new TDEPopupMenu( m_mnuContext );
- centerMenu->insertItem( i18n("Center &Horizontally"), TQT_TQOBJECT(this), TQT_SLOT( centerHorizontal() ) );
- centerMenu->insertItem( i18n("Center &Vertically"), TQT_TQOBJECT(this), TQT_SLOT( centerVertical() ) );
+ centerMenu->insertItem( i18n("Center &Horizontally"), this, TQ_SLOT( centerHorizontal() ) );
+ centerMenu->insertItem( i18n("Center &Vertically"), this, TQ_SLOT( centerVertical() ) );
m_mnuContext->insertItem( i18n("&Order"), orderMenu );
m_mnuContext->insertItem( i18n("&Center"), centerMenu );
m_mnuContext->insertSeparator();
- m_mnuContext->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), cv, TQT_SLOT( deleteCurrent() ) );
- m_mnuContext->insertItem( i18n("&Protect Position and Size"), TQT_TQOBJECT(this), TQT_SLOT( lockItem() ), 0, ID_LOCK_ITEM );
+ m_mnuContext->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), cv, TQ_SLOT( deleteCurrent() ) );
+ m_mnuContext->insertItem( i18n("&Protect Position and Size"), this, TQ_SLOT( lockItem() ), 0, ID_LOCK_ITEM );
m_mnuContext->insertSeparator();
- m_mnuContext->insertItem( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT( doubleClickedCurrent() ) );
+ m_mnuContext->insertItem( i18n("&Properties"), this, TQ_SLOT( doubleClickedCurrent() ) );
}
void LabelEditor::insertBarcode()
@@ -625,9 +625,6 @@ void LabelEditor::insertText()
void LabelEditor::insertDataText()
{
-// DocumentItemList list = cv->getAllItems();
-// TQStringList vars = m_token->listUserVars( &list );
-
TokenDialog dlg( m_token, this, "dlg" );
if( dlg.exec() == TQDialog::Accepted )
insertText( dlg.token() );
@@ -801,7 +798,7 @@ void LabelEditor::batchPrint( BatchPrinter* batch, int copies, int mode )
if( !buffer.open( IO_WriteOnly ) )
return;
- save( TQT_TQIODEVICE(&buffer) );
+ save( &buffer );
batch->setBuffer( &buffer );
batch->setSerial( TQString(), 1 );
@@ -947,10 +944,10 @@ void LabelEditor::preview()
if( !buffer.open( IO_WriteOnly ) )
return;
- save( TQT_TQIODEVICE(&buffer) );
+ save( &buffer );
// No need to delete pd as it has WDestructiveClose set!
- PreviewDialog* pd = new PreviewDialog( TQT_TQIODEVICE(&buffer), d, fileName(), this );
+ PreviewDialog* pd = new PreviewDialog( &buffer, d, fileName(), this );
pd->exec();
}
@@ -974,7 +971,7 @@ void LabelEditor::copy()
DocumentItemList items;
for( unsigned int i=0;i<list.count();i++)
- items.append( (list[i])->item() );
+ items.push_back( (list[i])->item() );
DocumentItemDrag* drag = new DocumentItemDrag();
drag->setDocumentItem( &items );
diff --git a/kbarcode/labeleditor.h b/kbarcode/labeleditor.h
index 06830f9..4e131e6 100644
--- a/kbarcode/labeleditor.h
+++ b/kbarcode/labeleditor.h
@@ -80,7 +80,7 @@ class TokenProvider;
* support. Use Batchprinting (LabelPrinter) for this.
*/
class LabelEditor : public DSMainWindow, public EditorIface, private LabelUtils, private XMLUtils {
- Q_OBJECT
+ TQ_OBJECT
public:
enum ELabelEditorMode {
diff --git a/kbarcode/labelutils.cpp b/kbarcode/labelutils.cpp
index 73f5a3b..0e3c542 100644
--- a/kbarcode/labelutils.cpp
+++ b/kbarcode/labelutils.cpp
@@ -43,7 +43,7 @@ LabelUtils::~LabelUtils()
double LabelUtils::pixelToMm( double pixel, const TQPaintDevice* device, int mode )
{
- TQPaintDeviceMetrics pdm( device ? device : TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
+ TQPaintDeviceMetrics pdm( device ? device : TDEApplication::desktop() );
if( mode == DpiX )
return (pixel * CONVERSION_FACTOR) / (double)pdm.logicalDpiX();
else
@@ -58,7 +58,7 @@ double LabelUtils::mmToPixel( double mm, const TQPaintDevice* device, int mode )
// We don't get valid metrics from the printer - and we want a better resolution
// anyway (it's the PS driver that takes care of the printer resolution).
- TQPaintDeviceMetrics pdm( device ? device : TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
+ TQPaintDeviceMetrics pdm( device ? device : TDEApplication::desktop() );
// tqDebug("DpiX=%i", pdm.logicalDpiX());
// tqDebug("DpiY=%i", pdm.logicalDpiY());
diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp
index b2384e9..50f3aba 100644
--- a/kbarcode/main.cpp
+++ b/kbarcode/main.cpp
@@ -83,9 +83,7 @@ int main(int argc, char *argv[])
{
TDEAboutData aboutData( "kbarcode", I18N_NOOP("KBarcode"), VERSION, I18N_NOOP(
"KBarcode is a barcode and label printing application for TDE."
- ), TDEAboutData::License_GPL, "KBarcode Build:\n" __DATE__ " " __TIME__
- , "(c) 2001-2006, Dominik Seichter\n\n",
- "http://www.kbarcode.net", "kbarcode-users@lists.sourceforge.net" );
+ ), TDEAboutData::License_GPL, "(c) 2001-2006, Dominik Seichter\n\n" );
aboutData.addAuthor("Dominik Seichter", I18N_NOOP("Programmer"), "domseichter@web.de");
aboutData.addAuthor("Stefan \"Stonki\" Onken",
@@ -121,7 +119,7 @@ int main(int argc, char *argv[])
setupDirs();
KImageIO::registerFormats();
- a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()));
+ a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()));
KBarcode* kbc = new KBarcode( 0, "KBarcodeMainWindow" );
diff --git a/kbarcode/mimesources.cpp b/kbarcode/mimesources.cpp
index 4767f3f..3213c4a 100644
--- a/kbarcode/mimesources.cpp
+++ b/kbarcode/mimesources.cpp
@@ -67,7 +67,7 @@ void DocumentItemDrag::setDocumentItem( DocumentItemList* list )
doc.appendChild( root );
XMLUtils xml;
- for( unsigned int i=0;i<list->count();i++)
+ for( unsigned int i=0;i<list->size();i++)
{
DocumentItem* item = list->at( i );
xml.writeXMLDocumentItem( &root, &item );
diff --git a/kbarcode/mimesources.h b/kbarcode/mimesources.h
index 13c1839..7ebeffe 100644
--- a/kbarcode/mimesources.h
+++ b/kbarcode/mimesources.h
@@ -26,7 +26,7 @@ class TokenProvider;
class MyCanvasView;
class DocumentItemDrag : public TQStoredDrag {
- Q_OBJECT
+ TQ_OBJECT
public:
DocumentItemDrag( TQWidget* dragSource = NULL, const char* name = 0 );
diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp
index 957a060..6208982 100644
--- a/kbarcode/multilineeditdlg.cpp
+++ b/kbarcode/multilineeditdlg.cpp
@@ -44,7 +44,7 @@ MultiLineEditor::MultiLineEditor( TokenProvider* token, TQWidget *parent, const
//editor->setText( text, "" );
editor->setFocus();
- TQDockArea* area = new TQDockArea( Qt::Horizontal, TQDockArea::Normal, this );
+ TQDockArea* area = new TQDockArea( TQt::Horizontal, TQDockArea::Normal, this );
toolBar = new TDEToolBar( area );
tool2Bar = new TDEToolBar( area );
tool3Bar = new TDEToolBar( area );
@@ -65,76 +65,76 @@ void MultiLineEditor::setupActions()
{
ac = new TDEActionCollection( this );
- TDEAction* action_export = new TDEAction( i18n("Export"), "fileexport", 0, TQT_TQOBJECT(this), TQT_SLOT( save() ), ac );
+ TDEAction* action_export = new TDEAction( i18n("Export"), "fileexport", 0, this, TQ_SLOT( save() ), ac );
//
// Edit Actions
//
- TDEAction *action_undo = KStdAction::undo( TQT_TQOBJECT(editor), TQT_SLOT( undo() ), ac );
+ TDEAction *action_undo = KStdAction::undo( editor, TQ_SLOT( undo() ), ac );
action_undo->setEnabled( false );
- connect( editor, TQT_SIGNAL( undoAvailable(bool) ), action_undo, TQT_SLOT( setEnabled(bool) ) );
+ connect( editor, TQ_SIGNAL( undoAvailable(bool) ), action_undo, TQ_SLOT( setEnabled(bool) ) );
- TDEAction *action_redo = KStdAction::redo( TQT_TQOBJECT(editor), TQT_SLOT( redo() ), ac );
+ TDEAction *action_redo = KStdAction::redo( editor, TQ_SLOT( redo() ), ac );
action_redo->setEnabled( false );
- connect( editor, TQT_SIGNAL( redoAvailable(bool) ), action_redo, TQT_SLOT( setEnabled(bool) ) );
+ connect( editor, TQ_SIGNAL( redoAvailable(bool) ), action_redo, TQ_SLOT( setEnabled(bool) ) );
- TDEAction *action_cut = KStdAction::cut( TQT_TQOBJECT(editor), TQT_SLOT( cut() ), ac );
+ TDEAction *action_cut = KStdAction::cut( editor, TQ_SLOT( cut() ), ac );
action_cut->setEnabled( false );
- connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_cut, TQT_SLOT( setEnabled(bool) ) );
+ connect( editor, TQ_SIGNAL( copyAvailable(bool) ), action_cut, TQ_SLOT( setEnabled(bool) ) );
- TDEAction *action_copy = KStdAction::copy( TQT_TQOBJECT(editor), TQT_SLOT( copy() ), ac );
+ TDEAction *action_copy = KStdAction::copy( editor, TQ_SLOT( copy() ), ac );
action_copy->setEnabled( false );
- connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_copy, TQT_SLOT( setEnabled(bool) ) );
+ connect( editor, TQ_SIGNAL( copyAvailable(bool) ), action_copy, TQ_SLOT( setEnabled(bool) ) );
- TDEAction* action_paste = KStdAction::paste( TQT_TQOBJECT(editor), TQT_SLOT( paste() ), ac );
+ TDEAction* action_paste = KStdAction::paste( editor, TQ_SLOT( paste() ), ac );
//
// Character Formatting
//
action_bold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, ac, "format_bold" );
- connect( action_bold, TQT_SIGNAL( toggled(bool) ), editor, TQT_SLOT( setBold(bool) ) );
+ connect( action_bold, TQ_SIGNAL( toggled(bool) ), editor, TQ_SLOT( setBold(bool) ) );
action_italic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, ac, "format_italic" );
- connect( action_italic, TQT_SIGNAL( toggled(bool) ), editor, TQT_SLOT( setItalic(bool) ) );
+ connect( action_italic, TQ_SIGNAL( toggled(bool) ), editor, TQ_SLOT( setItalic(bool) ) );
action_underline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, ac, "format_underline" );
- connect( action_underline, TQT_SIGNAL( toggled(bool) ), editor, TQT_SLOT( setUnderline(bool) ) );
+ connect( action_underline, TQ_SIGNAL( toggled(bool) ), editor, TQ_SLOT( setUnderline(bool) ) );
- TDEAction* action_color = new TDEAction( i18n("Text &Color..."), "colorpicker", 0, TQT_TQOBJECT(this), TQT_SLOT( formatColor() ), ac, "format_color" );
+ TDEAction* action_color = new TDEAction( i18n("Text &Color..."), "colorpicker", 0, this, TQ_SLOT( formatColor() ), ac, "format_color" );
//
// Font
//
action_font = new TDEFontAction( i18n("&Font"), 0, ac, "format_font" );
- connect( action_font, TQT_SIGNAL( activated( const TQString & ) ), editor, TQT_SLOT( setFamily( const TQString & ) ) );
+ connect( action_font, TQ_SIGNAL( activated( const TQString & ) ), editor, TQ_SLOT( setFamily( const TQString & ) ) );
action_font_size = new TDEFontSizeAction( i18n("Font &Size"), 0, ac, "format_font_size" );
- connect( action_font_size, TQT_SIGNAL( fontSizeChanged(int) ), editor, TQT_SLOT( setPointSize(int) ) );
+ connect( action_font_size, TQ_SIGNAL( fontSizeChanged(int) ), editor, TQ_SLOT( setPointSize(int) ) );
//
// Alignment
//
action_align_left = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0, ac, "format_align_left" );
- connect( action_align_left, TQT_SIGNAL( toggled(bool) ), TQT_TQOBJECT(this), TQT_SLOT( setAlignLeft(bool) ) );
+ connect( action_align_left, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( setAlignLeft(bool) ) );
action_align_center = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" );
- connect( action_align_center, TQT_SIGNAL( toggled(bool) ), TQT_TQOBJECT(this), TQT_SLOT( setAlignCenter(bool) ) );
+ connect( action_align_center, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( setAlignCenter(bool) ) );
action_align_right = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0, ac, "format_align_right" );
- connect( action_align_right, TQT_SIGNAL( toggled(bool) ), TQT_TQOBJECT(this), TQT_SLOT( setAlignRight(bool) ) );
+ connect( action_align_right, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( setAlignRight(bool) ) );
action_align_justify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" );
- connect( action_align_justify, TQT_SIGNAL( toggled(bool) ), TQT_TQOBJECT(this), TQT_SLOT( setAlignJustify(bool) ) );
+ connect( action_align_justify, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( setAlignJustify(bool) ) );
action_align_left->setExclusiveGroup( "alignment" );
action_align_center->setExclusiveGroup( "alignment" );
action_align_right->setExclusiveGroup( "alignment" );
action_align_justify->setExclusiveGroup( "alignment" );
- //TDEAction* action_spell = KStdAction::spelling( this, TQT_SLOT( checkSpelling() ), ac );
+ //TDEAction* action_spell = KStdAction::spelling( this, TQ_SLOT( checkSpelling() ), ac );
- TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewField() ), ac, "text_data_act"); action_export->plug( toolBar );
+ TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, this, TQ_SLOT( insertNewField() ), ac, "text_data_act"); action_export->plug( toolBar );
toolBar->insertSeparator();
action_undo->plug( toolBar );
@@ -165,9 +165,9 @@ void MultiLineEditor::setupActions()
//
updateActions();
- connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), TQT_TQOBJECT(this), TQT_SLOT( updateFont() ) );
- connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), TQT_TQOBJECT(this), TQT_SLOT( updateCharFmt() ) );
- connect( editor, TQT_SIGNAL( cursorPositionChanged( int,int ) ), TQT_TQOBJECT(this), TQT_SLOT( updateAligment() ) );
+ connect( editor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), this, TQ_SLOT( updateFont() ) );
+ connect( editor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), this, TQ_SLOT( updateCharFmt() ) );
+ connect( editor, TQ_SIGNAL( cursorPositionChanged( int,int ) ), this, TQ_SLOT( updateAligment() ) );
}
TQString MultiLineEditor::text()
@@ -279,7 +279,7 @@ void MultiLineEditor::checkSpelling()
spell = new KSpell( this, i18n("Spell Checking"), 0, 0, 0, true, true, KSpell::HTML );
spell->setAutoDelete( true );
spell->check( s, true );
- connect( spell, TQT_SIGNAL( done(const TQString &) ), TQT_TQOBJECT(this), TQT_SLOT( spellCheckDone(const TQString &) ) );
+ connect( spell, TQ_SIGNAL( done(const TQString &) ), this, TQ_SLOT( spellCheckDone(const TQString &) ) );
spell->cleanUp();
#endif
diff --git a/kbarcode/multilineeditdlg.h b/kbarcode/multilineeditdlg.h
index b7943de..fd6597f 100644
--- a/kbarcode/multilineeditdlg.h
+++ b/kbarcode/multilineeditdlg.h
@@ -32,7 +32,7 @@ class DSTextEdit;
class TokenProvider;
class MultiLineEditor : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
MultiLineEditor( TokenProvider* token, TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/mycanvasitem.cpp b/kbarcode/mycanvasitem.cpp
index 1044da5..ea33068 100644
--- a/kbarcode/mycanvasitem.cpp
+++ b/kbarcode/mycanvasitem.cpp
@@ -22,7 +22,7 @@
// KDE includes
#include <tdeapplication.h>
-// QT includes
+// TQt includes
#include <tqbitmap.h>
#include <tqpainter.h>
diff --git a/kbarcode/mycanvasview.cpp b/kbarcode/mycanvasview.cpp
index 2c7c7ef..8d46096 100644
--- a/kbarcode/mycanvasview.cpp
+++ b/kbarcode/mycanvasview.cpp
@@ -81,8 +81,8 @@ MyCanvasView::MyCanvasView( Definition* d, MyCanvas* c, TQWidget* parent, const
m_commov = 0;
canv = c;
- rulerv = new KRuler( Qt::Vertical, this );
- rulerh = new KRuler( Qt::Horizontal, this );
+ rulerv = new KRuler( TQt::Vertical, this );
+ rulerh = new KRuler( TQt::Horizontal, this );
if( Measurements::measurementSystem() == Measurements::Metric ) {
rulerv->setRulerMetricStyle( KRuler::Millimetres );
rulerh->setRulerMetricStyle( KRuler::Millimetres );
@@ -147,8 +147,8 @@ void MyCanvasView::contentsMouseMoveEvent(TQMouseEvent* e)
if( statusbar ) {
LabelUtils l;
- int x = (int)l.pixelToMm( e->x(), TQT_TQPAINTDEVICE(this), LabelUtils::DpiX );
- int y = (int)l.pixelToMm( e->y(), TQT_TQPAINTDEVICE(this), LabelUtils::DpiY );
+ int x = (int)l.pixelToMm( e->x(), this, LabelUtils::DpiX );
+ int y = (int)l.pixelToMm( e->y(), this, LabelUtils::DpiY );
statusbar->changeItem( i18n("Position: ") +
TQString( "%1%2 x %3%4" ).arg( x )
.arg( Measurements::system() ).arg( y ).arg( Measurements::system()), mouseid );
@@ -157,7 +157,7 @@ void MyCanvasView::contentsMouseMoveEvent(TQMouseEvent* e)
updateCursor( e->pos() );
// if no mouse button is pressed bail out now
- if( !(e->state() & Qt::LeftButton ) ) {
+ if( !(e->state() & TQt::LeftButton ) ) {
(void)updateCursor( e->pos(), true );
return;
}
@@ -179,8 +179,8 @@ void MyCanvasView::contentsMouseMoveEvent(TQMouseEvent* e)
LabelUtils l;
TQPoint pmm;
- pmm.setX( (int)l.pixelToMm( new_pt.x() - getTranslation().x(), TQT_TQPAINTDEVICE(this), LabelUtils::DpiX ) * 1000 );
- pmm.setY( (int)l.pixelToMm( new_pt.y() - getTranslation().y(), TQT_TQPAINTDEVICE(this), LabelUtils::DpiY ) * 1000 );
+ pmm.setX( (int)l.pixelToMm( new_pt.x() - getTranslation().x(), this, LabelUtils::DpiX ) * 1000 );
+ pmm.setY( (int)l.pixelToMm( new_pt.y() - getTranslation().y(), this, LabelUtils::DpiY ) * 1000 );
// Move the item
MoveCommand* mv = new MoveCommand( pmm.x() - moving->item()->rectMM().x(),
@@ -197,8 +197,8 @@ void MyCanvasView::contentsMouseMoveEvent(TQMouseEvent* e)
LabelUtils l;
TQPoint pmm;
- pmm.setX( (int)l.pixelToMm( p.x() - getTranslation().x(), TQT_TQPAINTDEVICE(this), LabelUtils::DpiX ) * 1000 );
- pmm.setY( (int)l.pixelToMm( p.y() - getTranslation().y(), TQT_TQPAINTDEVICE(this), LabelUtils::DpiY ) * 1000 );
+ pmm.setX( (int)l.pixelToMm( p.x() - getTranslation().x(), this, LabelUtils::DpiX ) * 1000 );
+ pmm.setY( (int)l.pixelToMm( p.y() - getTranslation().y(), this, LabelUtils::DpiY ) * 1000 );
TQRect rmm = moving->item()->rectMM();
ResizeCommand* mv = new ResizeCommand( moving, shift_pressed );
@@ -258,13 +258,13 @@ void MyCanvasView::contentsMousePressEvent(TQMouseEvent* e)
delta_pt=TQPoint(e->x() - old.x(),e->y() - old.y());
}
- if( e->button() == Qt::RightButton && getActive() )
+ if( e->button() == TQt::RightButton && getActive() )
emit showContextMenu( e->globalPos() );
}
void MyCanvasView::contentsMouseReleaseEvent(TQMouseEvent* e)
{
- if( e->button() != Qt::LeftButton || getSelected().isEmpty() )
+ if( e->button() != TQt::LeftButton || getSelected().isEmpty() )
return;
if( m_commov ) {
@@ -399,7 +399,7 @@ void MyCanvasView::updateRuler()
rulerv->setGeometry( 0, 20, 20, height() - 20 );
if( def ) {
- canv->setRect( TQRect( translation.x(), translation.y(), (int)def->getMeasurements().width( TQT_TQPAINTDEVICE(this) ), (int)def->getMeasurements().height( TQT_TQPAINTDEVICE(this) )) );
+ canv->setRect( TQRect( translation.x(), translation.y(), (int)def->getMeasurements().width( this ), (int)def->getMeasurements().height( this )) );
rulerv->setMaxValue( height() );
rulerh->setMaxValue( width() );
@@ -443,16 +443,16 @@ void MyCanvasView::reposition()
* and multiply with the new one.
* As a result we have the correct width.
*/
- int x = int((width() - (def->getMeasurements().width( TQT_TQPAINTDEVICE(this) )) ) / 2);
- int y = int((height() - (def->getMeasurements().height( TQT_TQPAINTDEVICE(this) )) ) / 2);
+ int x = int((width() - (def->getMeasurements().width( this )) ) / 2);
+ int y = int((height() - (def->getMeasurements().height( this )) ) / 2);
// move label 30 pixels away from top/left if necessary
x = x > 0 ? x : 30;
y = y > 0 ? y : 30;
// make sure that there is some space around the label, therefore at 60 pixel
- int w = ( this->width() - 2 > def->getMeasurements().width( TQT_TQPAINTDEVICE(this) ) ? this->width() - 2 : int(def->getMeasurements().width( TQT_TQPAINTDEVICE(this) ) + 60) );
- int h = ( this->height() - 2 > def->getMeasurements().height( TQT_TQPAINTDEVICE(this) ) ? this->height() - 2 : int(def->getMeasurements().height( TQT_TQPAINTDEVICE(this) ) + 60) );
+ int w = ( this->width() - 2 > def->getMeasurements().width( this ) ? this->width() - 2 : int(def->getMeasurements().width( this ) + 60) );
+ int h = ( this->height() - 2 > def->getMeasurements().height( this ) ? this->height() - 2 : int(def->getMeasurements().height( this ) + 60) );
canvas()->resize( w, h );
@@ -529,7 +529,7 @@ DocumentItemList MyCanvasView::getAllItems()
TQCanvasItemList list = canvas()->allItems();
for( unsigned int i = 0; i < list.count(); i++ )
- l.append( ((TCanvasItem*)list[i])->item() );
+ l.push_back( ((TCanvasItem*)list[i])->item() );
return l;
}
diff --git a/kbarcode/mycanvasview.h b/kbarcode/mycanvasview.h
index ec917e7..cc2232c 100644
--- a/kbarcode/mycanvasview.h
+++ b/kbarcode/mycanvasview.h
@@ -30,7 +30,7 @@ typedef TQValueList<TCanvasItem*> TCanvasItemList;
class TQRect;
class TQPainter;
class MyCanvas : public TQCanvas {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -69,7 +69,7 @@ class KRuler;
class KStatusBar;
class MyCanvasView : public TQCanvasView
{
- Q_OBJECT
+ TQ_OBJECT
enum edges {
@@ -90,9 +90,9 @@ class MyCanvasView : public TQCanvasView
MyCanvasView( Definition* d, MyCanvas *c, TQWidget* parent=0, const char* name=0, WFlags f=0);
~MyCanvasView();
- /** return a list of all DocumentItems on the canvas
- */
- DocumentItemList getAllItems();
+ /** return a list of all DocumentItems on the canvas
+ */
+ DocumentItemList getAllItems();
TCanvasItemList getSelected();
diff --git a/kbarcode/mydatatable.h b/kbarcode/mydatatable.h
index e476856..5c313fa 100644
--- a/kbarcode/mydatatable.h
+++ b/kbarcode/mydatatable.h
@@ -24,7 +24,7 @@
/** A table to modify SQL tables.
*/
class MyDataTable : public TQDataTable {
- Q_OBJECT
+ TQ_OBJECT
public:
MyDataTable(TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/newlabel.cpp b/kbarcode/newlabel.cpp
index ba86bc3..9c60eff 100644
--- a/kbarcode/newlabel.cpp
+++ b/kbarcode/newlabel.cpp
@@ -54,7 +54,7 @@ NewLabel::NewLabel( TQWidget* parent, const char* name, bool change, WFlags fl
TQGroupBox* group1 = new TQGroupBox( this );
group1->setTitle( i18n( "Label" ) );
- group1->setColumnLayout(0, Qt::Vertical );
+ group1->setColumnLayout(0, TQt::Vertical );
group1->layout()->setSpacing( 6 );
group1->layout()->setMargin( 11 );
TQGridLayout* group1Layout = new TQGridLayout( group1->layout() );
@@ -115,14 +115,14 @@ NewLabel::NewLabel( TQWidget* parent, const char* name, bool change, WFlags fl
Layout1->addWidget( buttonCancel );
NewLabelLayout->addLayout( Layout1 );
- connect( comboProducer, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( updateType() ) );
- connect( comboProducer, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( updateText() ) );
- connect( comboType, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( updateText() ) );
- connect( checkEmpty, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updateText() ) );
+ connect( comboProducer, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( updateType() ) );
+ connect( comboProducer, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( updateText() ) );
+ connect( comboType, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( updateText() ) );
+ connect( checkEmpty, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updateText() ) );
- connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT(accept() ) );
- connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT(reject() ) );
- connect( buttonOwnFormat, TQT_SIGNAL( clicked() ), this, TQT_SLOT(add() ) );
+ connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT(accept() ) );
+ connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT(reject() ) );
+ connect( buttonOwnFormat, TQ_SIGNAL( clicked() ), this, TQ_SLOT(add() ) );
fillData();
updateType();
updateText();
diff --git a/kbarcode/newlabel.h b/kbarcode/newlabel.h
index 2194269..450f6c2 100644
--- a/kbarcode/newlabel.h
+++ b/kbarcode/newlabel.h
@@ -35,7 +35,7 @@ class TQString;
class LabelPreview;
class NewLabel : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
NewLabel( TQWidget* parent = 0, const char* name = 0, bool change = FALSE, WFlags fl = 0 );
diff --git a/kbarcode/pics/Makefile.am b/kbarcode/pics/Makefile.am
deleted file mode 100644
index 7127f64..0000000
--- a/kbarcode/pics/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-kbarcodepicsdir = $(kde_datadir)/kbarcode
-kbarcodepics_DATA = logo.png \ No newline at end of file
diff --git a/kbarcode/pixmapbarcode.cpp b/kbarcode/pixmapbarcode.cpp
index 785441b..2b682c0 100644
--- a/kbarcode/pixmapbarcode.cpp
+++ b/kbarcode/pixmapbarcode.cpp
@@ -114,7 +114,7 @@ void PixmapBarcode::update( const TQPaintDevice* device )
void PixmapBarcode::drawBarcode( TQPainter & painter, int x, int y )
{
if( p.isNull() )
- createBarcode( &p, TQT_TQPAINTDEVICE(painter.device()) );
+ createBarcode( &p, painter.device() );
if( p.isNull() ) // still no barcode....
{
diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp
index 7183520..fe4bb24 100644
--- a/kbarcode/previewdialog.cpp
+++ b/kbarcode/previewdialog.cpp
@@ -113,7 +113,7 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
preview = new TQLabel( sv->viewport() );
sv->addChild( preview );
- TQPixmap pix( (int)d->getMeasurements().width( TQT_TQPAINTDEVICE(this) ), (int)d->getMeasurements().height( TQT_TQPAINTDEVICE(this) ) );
+ TQPixmap pix( (int)d->getMeasurements().width( this ), (int)d->getMeasurements().height( this ) );
pix.fill( TQt::white );
preview->setPixmap( pix );
@@ -127,17 +127,17 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
Layout->addLayout( vbox );
Layout->addLayout( buttons );
- connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
- connect( buttonAddr, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAddress() ) );
+ connect( buttonClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
+ connect( buttonAddr, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectAddress() ) );
// TODO:
// remove this ugly hack! The finished label is only shown when I call
// updateChanges() twice. I have no idea why!
- connect( buttonUpdate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updatechanges() ) );
- connect( buttonUpdate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updatechanges() ) );
+ connect( buttonUpdate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updatechanges() ) );
+ connect( buttonUpdate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updatechanges() ) );
// end ugly hack
- connect( customerName, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerNameChanged(int) ) );
- connect( customerId, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerIdChanged(int) ) );
+ connect( customerName, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerNameChanged(int) ) );
+ connect( customerId, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerIdChanged(int) ) );
TDEConfig* config = kapp->config();
config->setGroup( "PreviewDialog" );
@@ -182,12 +182,12 @@ void PreviewDialog::selectAddress()
void PreviewDialog::updatechanges()
{
- TQPixmap pix( (int)def->getMeasurements().width( TQT_TQPAINTDEVICE(this) ), (int)def->getMeasurements().height( TQT_TQPAINTDEVICE(this) ) );
+ TQPixmap pix( (int)def->getMeasurements().width( this ), (int)def->getMeasurements().height( this ) );
pix.fill( TQt::white );
TQPainter painter( &pix );
- Label* l = new Label( def, file, m_filename, TQT_TQPAINTDEVICE(TDEApplication::desktop()),
+ Label* l = new Label( def, file, m_filename, TDEApplication::desktop(),
customerId->currentText(), articleId->text(), groupName->text() );
l->setIndex( spinIndex->value() - 1 );
l->setSerial( serialStart->text(), serialInc->value() );
diff --git a/kbarcode/previewdialog.h b/kbarcode/previewdialog.h
index f385546..6d9f7bd 100644
--- a/kbarcode/previewdialog.h
+++ b/kbarcode/previewdialog.h
@@ -30,7 +30,7 @@ class TQIODevice;
class TQLabel;
class TQWidget;
class PreviewDialog : public TQDialog {
- Q_OBJECT
+ TQ_OBJECT
public:
PreviewDialog( TQIODevice* device, Definition* d, TQString filename, TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp
index e0e1ba6..cf0de20 100644
--- a/kbarcode/printersettings.cpp
+++ b/kbarcode/printersettings.cpp
@@ -26,7 +26,7 @@
#include <tdelocale.h>
#include <kurl.h>
-// Stolen from koffice/lib/kofficecore/koGlobal.cc
+// Stolen from koffice/lib/kofficecore/koGlobal.cpp
// and modified afterwards
// - the comments "should be..." indicates the exact values if the inch sizes would be multiplied by 25.4 mm/inch
@@ -76,7 +76,7 @@ PrinterSettings::PrinterSettings()
lpdata = new labelprinterdata;
loadConfig();
- connect( kapp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( saveConfig() ) );
+ connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
}
PrinterSettings::~PrinterSettings()
diff --git a/kbarcode/printersettings.h b/kbarcode/printersettings.h
index de339b8..d4ccda9 100644
--- a/kbarcode/printersettings.h
+++ b/kbarcode/printersettings.h
@@ -58,7 +58,7 @@ struct PageFormatInfo
class KPrinter;
class KComboBox;
class PrinterSettings: public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
enum { High = TQPrinter::HighResolution, Middle, VeryHigh };
diff --git a/kbarcode/printlabeldlg.h b/kbarcode/printlabeldlg.h
index 5d5ce25..582aceb 100644
--- a/kbarcode/printlabeldlg.h
+++ b/kbarcode/printlabeldlg.h
@@ -32,7 +32,7 @@ class KIntNumInput;
* label should be printed.
*/
class PrintLabelDlg : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
PrintLabelDlg(TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/propertywidget.cpp b/kbarcode/propertywidget.cpp
index 37fd234..cd60ca0 100644
--- a/kbarcode/propertywidget.cpp
+++ b/kbarcode/propertywidget.cpp
@@ -106,7 +106,7 @@ PropertyBorder::PropertyBorder( TQWidget* parent )
grid->addWidget( comboLine, 3, 1 );
- connect( checkBorder, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( checkBorder, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
}
void PropertyBorder::applySettings( DocumentItem* item, KMacroCommand* command )
@@ -231,8 +231,8 @@ PropertyBarcode::PropertyBarcode( TokenProvider* token, TQWidget* parent )
barcode = new BarcodeWidget( this, "barcode" );
barcode->setTokenProvider( token );
- //connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT( defaults() ) );
- connect( comboComplex, TQT_SIGNAL( activated(int) ), this, TQT_SLOT(changedCombo() ) );
+ //connect( this, TQ_SIGNAL( defaultClicked() ), this, TQ_SLOT( defaults() ) );
+ connect( comboComplex, TQ_SIGNAL( activated(int) ), this, TQ_SLOT(changedCombo() ) );
grid->addWidget( TextLabel1, 0, 0 );
grid->addWidget( comboComplex, 0, 1 );
@@ -361,7 +361,7 @@ PropertySize::PropertySize( TQWidget* parent )
grid->addWidget( box, 0, 0 );
- connect( checkLock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ));
+ connect( checkLock, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ));
}
void PropertySize::enableControls()
@@ -502,9 +502,9 @@ PropertyImage::PropertyImage( TokenProvider* token, TQWidget* parent )
grid->addMultiCellWidget( checkMirrorH, 5, 5, 0, 1 );
grid->addMultiCellWidget( checkMirrorV, 6, 6, 0, 1 );
- connect( radioImageExpression, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioImagePath, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( buttonToken, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTokens() ) );
+ connect( radioImageExpression, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioImagePath, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( buttonToken, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTokens() ) );
}
void PropertyImage::applySettings( DocumentItem* item, KMacroCommand* command )
diff --git a/kbarcode/propertywidget.h b/kbarcode/propertywidget.h
index ebc32cf..feb2117 100644
--- a/kbarcode/propertywidget.h
+++ b/kbarcode/propertywidget.h
@@ -48,7 +48,7 @@ class KPushButton;
*/
class PropertyWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyWidget( TQWidget* parent );
@@ -61,7 +61,7 @@ class PropertyWidget : public TQWidget
};
class PropertyBorder : public PropertyWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyBorder( TQWidget* parent );
@@ -80,7 +80,7 @@ class PropertyBorder : public PropertyWidget {
};
class PropertyRotation : public PropertyWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyRotation( TQWidget* parent );
@@ -93,7 +93,7 @@ class PropertyRotation : public PropertyWidget {
};
class PropertyFill : public PropertyWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyFill( TQWidget* parent );
@@ -106,7 +106,7 @@ class PropertyFill : public PropertyWidget {
};
class PropertyBarcode : public PropertyWidget, private LabelUtils {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyBarcode( TokenProvider* token, TQWidget* parent );
@@ -123,7 +123,7 @@ class PropertyBarcode : public PropertyWidget, private LabelUtils {
};
class PropertyText : public PropertyWidget, private LabelUtils {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyText( TokenProvider* token, TQWidget* parent );
@@ -137,7 +137,7 @@ class PropertyText : public PropertyWidget, private LabelUtils {
//NY22
class PropertyTextLine : public PropertyWidget, private LabelUtils {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyTextLine( TokenProvider* token, TQWidget* parent );
@@ -151,7 +151,7 @@ class PropertyTextLine : public PropertyWidget, private LabelUtils {
//NY22
class PropertySize : public PropertyWidget, private LabelUtils {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertySize( TQWidget* parent );
@@ -171,7 +171,7 @@ class PropertySize : public PropertyWidget, private LabelUtils {
};
class PropertyImage : public PropertyWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyImage( TokenProvider* token, TQWidget* parent );
@@ -205,7 +205,7 @@ class PropertyImage : public PropertyWidget {
};
class PropertyVisible : public PropertyWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
PropertyVisible( TQWidget* parent );
diff --git a/kbarcode/rectsettingsdlg.cpp b/kbarcode/rectsettingsdlg.cpp
index 7fc8964..10e6958 100644
--- a/kbarcode/rectsettingsdlg.cpp
+++ b/kbarcode/rectsettingsdlg.cpp
@@ -81,7 +81,7 @@ RectSettingsDlg::RectSettingsDlg(TQWidget *parent, const char *name )
grid->addWidget( new TQLabel( i18n("Line Style:"), frame ), 5, 0 );
grid->addWidget( comboLine, 5, 1 );
- connect( checkBorder, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( checkBorder, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
}
RectSettingsDlg::~RectSettingsDlg()
diff --git a/kbarcode/rectsettingsdlg.h b/kbarcode/rectsettingsdlg.h
index 2a88169..4d747ef 100644
--- a/kbarcode/rectsettingsdlg.h
+++ b/kbarcode/rectsettingsdlg.h
@@ -25,7 +25,7 @@ class KComboBox;
class KIntNumInput;
class TQCheckBox;
class RectSettingsDlg : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
RectSettingsDlg(TQWidget *parent=0, const char *name=0);
@@ -56,7 +56,7 @@ class RectSettingsDlg : public KDialogBase {
class TQPen;
class LineSettingsDlg : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
LineSettingsDlg(TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/smalldialogs.cpp b/kbarcode/smalldialogs.cpp
index 2088970..7fec4ca 100644
--- a/kbarcode/smalldialogs.cpp
+++ b/kbarcode/smalldialogs.cpp
@@ -98,8 +98,8 @@ void AddItemsDialog::init()
setupSql();
- connect( SqlTables::getInstance(), TQT_SIGNAL( tablesChanged() ), this, TQT_SLOT( setupSql() ) );
- connect( SqlTables::getInstance(), TQT_SIGNAL( connectedSQL() ), this, TQT_SLOT( setupSql() ) );
+ connect( SqlTables::getInstance(), TQ_SIGNAL( tablesChanged() ), this, TQ_SLOT( setupSql() ) );
+ connect( SqlTables::getInstance(), TQ_SIGNAL( connectedSQL() ), this, TQ_SLOT( setupSql() ) );
}
void AddItemsDialog::slotUser1()
diff --git a/kbarcode/smalldialogs.h b/kbarcode/smalldialogs.h
index 994efed..dc5c17b 100644
--- a/kbarcode/smalldialogs.h
+++ b/kbarcode/smalldialogs.h
@@ -28,7 +28,7 @@ class KLineEdit;
namespace DSSmallDialogs {
class AddAllDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
AddAllDialog(TQWidget *parent=0, const char *name=0);
@@ -42,7 +42,7 @@ namespace DSSmallDialogs {
};
class AddItemsDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
AddItemsDialog( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index 6a10b4a..d5dc9a5 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -89,7 +89,7 @@ SqlTables::SqlTables( TQObject* parent )
connected = false;
loadConfig();
- connect( kapp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( saveConfig() ) );
+ connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
}
SqlTables::~SqlTables()
@@ -521,7 +521,7 @@ SqlWidget::SqlWidget( bool showlabel, TQWidget* parent, const char* name )
TQGroupBox* groupDatabase = new TQGroupBox( this );
groupDatabase->setTitle( i18n( "Database Settings" ) );
- groupDatabase->setColumnLayout(0, Qt::Vertical );
+ groupDatabase->setColumnLayout(0, TQt::Vertical );
groupDatabase->layout()->setSpacing( 6 );
groupDatabase->layout()->setMargin( 11 );
TQVBoxLayout* groupDatabaseLayout = new TQVBoxLayout( groupDatabase->layout() );
@@ -584,7 +584,7 @@ SqlWidget::SqlWidget( bool showlabel, TQWidget* parent, const char* name )
layout->add( groupDatabase );
- connect( buttonTest, TQT_SIGNAL( clicked() ), this, TQT_SLOT( testSettings() ) );
+ connect( buttonTest, TQ_SIGNAL( clicked() ), this, TQ_SLOT( testSettings() ) );
const mysqldata & sqldata = SqlTables::getInstance()->getData();
m_username->setText( sqldata.username );
diff --git a/kbarcode/sqltables.h b/kbarcode/sqltables.h
index a9ea6fb..d57adcf 100644
--- a/kbarcode/sqltables.h
+++ b/kbarcode/sqltables.h
@@ -85,7 +85,7 @@ class TQSqlQuery;
* @author Dominik Seichter
*/
class SqlTables : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
/** get a mysqldata object which contains the current database settings.
@@ -176,7 +176,7 @@ class TQCheckBox;
* @author Dominik Seichter
*/
class SqlWidget : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
SqlWidget( bool showlabel, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kbarcode/tcanvasitem.cpp b/kbarcode/tcanvasitem.cpp
index 39a9b98..8259be2 100644
--- a/kbarcode/tcanvasitem.cpp
+++ b/kbarcode/tcanvasitem.cpp
@@ -96,8 +96,8 @@ void TCanvasItem::moveMM( int x, int y )
LabelUtils l;
// the TQCanvasRectangle::move is done before the real move
// as we get dancing TCanvasItems on the screen otherwise
- TQCanvasRectangle::move( l.mmToPixel( x / 1000.0, TQT_TQPAINTDEVICE(m_view), LabelUtils::DpiX ) + m_view->getTranslation().x(),
- l.mmToPixel( y / 1000.0, TQT_TQPAINTDEVICE(m_view), LabelUtils::DpiY ) + m_view->getTranslation().y() );
+ TQCanvasRectangle::move( l.mmToPixel( x / 1000.0, m_view, LabelUtils::DpiX ) + m_view->getTranslation().x(),
+ l.mmToPixel( y / 1000.0, m_view, LabelUtils::DpiY ) + m_view->getTranslation().y() );
m_item->moveMM( x, y );
}
}
diff --git a/kbarcode/tec.cpp b/kbarcode/tec.cpp
index 6d6dfa5..7fffe12 100644
--- a/kbarcode/tec.cpp
+++ b/kbarcode/tec.cpp
@@ -21,7 +21,7 @@
#include <math.h>
#include <unistd.h>
-// QT includes
+// TQt includes
#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqgroupbox.h>
diff --git a/kbarcode/tec.h b/kbarcode/tec.h
index 34e82e9..9e6060f 100644
--- a/kbarcode/tec.h
+++ b/kbarcode/tec.h
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
-// QT includes
+// TQt includes
#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqgroupbox.h>
diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp
index a0c561e..3ea4113 100644
--- a/kbarcode/textlineedit.cpp
+++ b/kbarcode/textlineedit.cpp
@@ -41,7 +41,7 @@ TextLineEditor::TextLineEditor( TokenProvider* token, TQWidget *parent, const ch
editor->setFocus();
- TQDockArea* area = new TQDockArea( Qt::Horizontal, TQDockArea::Normal, this );
+ TQDockArea* area = new TQDockArea( TQt::Horizontal, TQDockArea::Normal, this );
toolBar = new TDEToolBar( area );
tool2Bar = new TDEToolBar( area );
tool3Bar = new TDEToolBar( area );
@@ -68,26 +68,26 @@ void TextLineEditor::setupActions()
ac = new TDEActionCollection( this );
- TDEAction *action_undo = KStdAction::undo( TQT_TQOBJECT(editor), TQT_SLOT( undo() ), ac );
+ TDEAction *action_undo = KStdAction::undo( editor, TQ_SLOT( undo() ), ac );
action_undo->setEnabled( false );
- connect( editor, TQT_SIGNAL( undoAvailable(bool) ), action_undo, TQT_SLOT( setEnabled(bool) ) );
+ connect( editor, TQ_SIGNAL( undoAvailable(bool) ), action_undo, TQ_SLOT( setEnabled(bool) ) );
- TDEAction *action_redo = KStdAction::redo( TQT_TQOBJECT(editor), TQT_SLOT( redo() ), ac );
+ TDEAction *action_redo = KStdAction::redo( editor, TQ_SLOT( redo() ), ac );
action_redo->setEnabled( false );
- connect( editor, TQT_SIGNAL( redoAvailable(bool) ), action_redo, TQT_SLOT( setEnabled(bool) ) );
+ connect( editor, TQ_SIGNAL( redoAvailable(bool) ), action_redo, TQ_SLOT( setEnabled(bool) ) );
- TDEAction *action_cut = KStdAction::cut( TQT_TQOBJECT(editor), TQT_SLOT( cut() ), ac );
+ TDEAction *action_cut = KStdAction::cut( editor, TQ_SLOT( cut() ), ac );
action_cut->setEnabled( false );
- connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_cut, TQT_SLOT( setEnabled(bool) ) );
+ connect( editor, TQ_SIGNAL( copyAvailable(bool) ), action_cut, TQ_SLOT( setEnabled(bool) ) );
- TDEAction *action_copy = KStdAction::copy( TQT_TQOBJECT(editor), TQT_SLOT( copy() ), ac );
+ TDEAction *action_copy = KStdAction::copy( editor, TQ_SLOT( copy() ), ac );
action_copy->setEnabled( false );
- connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_copy, TQT_SLOT( setEnabled(bool) ) );
+ connect( editor, TQ_SIGNAL( copyAvailable(bool) ), action_copy, TQ_SLOT( setEnabled(bool) ) );
- TDEAction* action_paste = KStdAction::paste( TQT_TQOBJECT(editor), TQT_SLOT( paste() ), ac );
+ TDEAction* action_paste = KStdAction::paste( editor, TQ_SLOT( paste() ), ac );
- TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewField() ), ac, "text_data_act");
+ TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, this, TQ_SLOT( insertNewField() ), ac, "text_data_act");
action_undo->plug( toolBar );
action_redo->plug( toolBar );
@@ -122,7 +122,7 @@ void TextLineEditor::setupActions()
textDataAct->plug( tool2Bar );
action_font_type = new KComboBox(tool2Bar,"font_type") ;
- connect( action_font_type, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( setFontType(int) ) );
+ connect( action_font_type, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setFontType(int) ) );
action_font_type->insertStringList(fuentes) ;
@@ -131,8 +131,8 @@ void TextLineEditor::setupActions()
mag_vert = new KIntNumInput( tool3Bar,"magvert" );
TQLabel* labelh = new TQLabel( i18n("&Mag. Hor.:"), tool3Bar );
mag_hor = new KIntNumInput( tool3Bar,"maghor" );
- connect( mag_vert, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( setVerMag(int) ) );
- connect( mag_hor, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( setHorMag(int) ) );
+ connect( mag_vert, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setVerMag(int) ) );
+ connect( mag_hor, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setHorMag(int) ) );
mag_vert->setRange( 1, 9, 1, false );
mag_hor->setRange( 1, 9, 1, false );
diff --git a/kbarcode/textlineedit.h b/kbarcode/textlineedit.h
index 282d22e..78638b4 100644
--- a/kbarcode/textlineedit.h
+++ b/kbarcode/textlineedit.h
@@ -29,7 +29,7 @@ class TokenProvider;
class KLineEdit;
class TextLineEditor : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
TextLineEditor( TokenProvider* token, TQWidget *parent=0, const char *name=0);
diff --git a/kbarcode/tokendialog.cpp b/kbarcode/tokendialog.cpp
index d27ae44..aa12ebe 100644
--- a/kbarcode/tokendialog.cpp
+++ b/kbarcode/tokendialog.cpp
@@ -114,9 +114,9 @@ void TokenDialog::setupStackPage2()
radioVariable->setChecked( true );
- connect( radioVariable, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioSQLQuery, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioJavaScript, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+ connect( radioVariable, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioSQLQuery, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioJavaScript, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
page2->addWidget( stackPage2 );
}
@@ -160,8 +160,8 @@ void TokenDialog::setupStack2Page1()
right->setStretchFactor( allList, 2 );
splitter->setSizes( sizes );
- connect( category, TQT_SIGNAL( executed( TQListBoxItem* ) ), this, TQT_SLOT( categoryChanged( TQListBoxItem* ) ) );
- connect( allList, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( itemChanged( TQListViewItem* ) ) );
+ connect( category, TQ_SIGNAL( executed( TQListBoxItem* ) ), this, TQ_SLOT( categoryChanged( TQListBoxItem* ) ) );
+ connect( allList, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( itemChanged( TQListViewItem* ) ) );
initAll();
@@ -178,8 +178,8 @@ void TokenDialog::setupStack2Page2()
labelList->setColumnWidthMode( 0, TQListView::Maximum );
labelList->setColumnWidthMode( 1, TQListView::Maximum );
- connect( labelList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( enableControls() ) );
- connect( labelList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( accept() ) );
+ connect( labelList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableControls() ) );
+ connect( labelList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( accept() ) );
page3->addWidget( stack2Page2 );
}
@@ -202,11 +202,11 @@ void TokenDialog::setupStack2Page3()
if( !listVariable->count() )
radioVariableExisting->setEnabled( false );
- connect( radioVariableNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( radioVariableExisting, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
- connect( editVariable, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
- connect( listVariable, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( enableControls() ) );
- connect( listVariable, TQT_SIGNAL( doubleClicked( TQListBoxItem*, const TQPoint & ) ), this, TQT_SLOT( accept() ) );
+ connect( radioVariableNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( radioVariableExisting, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+ connect( editVariable, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
+ connect( listVariable, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( enableControls() ) );
+ connect( listVariable, TQ_SIGNAL( doubleClicked( TQListBoxItem*, const TQPoint & ) ), this, TQ_SLOT( accept() ) );
page3->addWidget( stack2Page3 );
}
@@ -232,8 +232,8 @@ void TokenDialog::setupStack2Page4()
textQueryResults = new TQTextBrowser( stack2Page4 );
textQueryResults->setReadOnly( true );
- connect( buttonQuery, TQT_SIGNAL( clicked() ), this, TQT_SLOT( testQuery() ) );
- connect( editQuery, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
+ connect( buttonQuery, TQ_SIGNAL( clicked() ), this, TQ_SLOT( testQuery() ) );
+ connect( editQuery, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
page3->addWidget( stack2Page4 );
}
@@ -245,7 +245,7 @@ void TokenDialog::setupStack2Page5()
editJavaScript = new DSTextEdit( stack2Page5 );
editJavaScript->setText( i18n("/* Place your JavaScript code into this text field. */\n") );
- connect( editJavaScript, TQT_SIGNAL( textChanged() ), TQT_SLOT( enableControls() ) );
+ connect( editJavaScript, TQ_SIGNAL( textChanged() ), TQ_SLOT( enableControls() ) );
page3->addWidget( stack2Page5 );
}
diff --git a/kbarcode/tokendialog.h b/kbarcode/tokendialog.h
index 35e623a..9d35ada 100644
--- a/kbarcode/tokendialog.h
+++ b/kbarcode/tokendialog.h
@@ -39,7 +39,7 @@ class DSTextEdit;
class TokenDialog : public KWizard {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kbarcode/tokenprovider.cpp b/kbarcode/tokenprovider.cpp
index 7cdc774..90e2853 100644
--- a/kbarcode/tokenprovider.cpp
+++ b/kbarcode/tokenprovider.cpp
@@ -401,7 +401,7 @@ TQStringList TokenProvider::listUserVars()
m_findUserVarsList = &lst;
- for( i=0;i<m_document_items.count();i++ )
+ for( i=0;i<m_document_items.size();i++ )
{
item = m_document_items.at(i);
t = TQString();
diff --git a/kbarcode/xmlutils.cpp b/kbarcode/xmlutils.cpp
index 6095574..51e2c20 100644
--- a/kbarcode/xmlutils.cpp
+++ b/kbarcode/xmlutils.cpp
@@ -121,7 +121,6 @@ void XMLUtils::writeXMLHeader( TQDomNode* root, const TQString & description, De
void XMLUtils::readDocumentItems( DocumentItemList* list, TQDomDocument* doc, TokenProvider* token, bool kbarcode18 )
{
TQDomNode n = doc->documentElement().firstChild();
- list->setAutoDelete( false );
if( kbarcode18 )
{
@@ -136,7 +135,7 @@ void XMLUtils::readDocumentItems( DocumentItemList* list, TQDomDocument* doc, To
bcode->updateBarcode();
bcode->setZ( e.attribute( "z", "0" ).toInt() );
- list->append( bcode );
+ list->push_back( bcode );
} else if( e.tagName() == "textfield" ) {
TextItem* t = new TextItem();
t->setTokenProvider( token );
@@ -157,7 +156,7 @@ void XMLUtils::readDocumentItems( DocumentItemList* list, TQDomDocument* doc, To
n = n.nextSibling();
}
- list->append( t );
+ list->push_back( t );
} else if( e.tagName() == "picture" ) {
ImageItem* r = new ImageItem();
@@ -169,7 +168,7 @@ void XMLUtils::readDocumentItems( DocumentItemList* list, TQDomDocument* doc, To
r->setPixmap( pix );
r->setRotation( e.attribute("rotation", "0.0" ).toDouble() );
r->setZ( e.attribute( "z", "0" ).toInt() );
- list->append( r );
+ list->push_back( r );
} else if( e.tagName() == "rect" ) {
RectItem* r = new RectItem();
@@ -181,7 +180,7 @@ void XMLUtils::readDocumentItems( DocumentItemList* list, TQDomDocument* doc, To
r->setPen( TQPen(readXMLColor( &e, "bordercolor", TQt::black ),e.attribute( "borderwidth", "1" ).toInt(),(TQt::PenStyle)e.attribute( "borderstyle", "1" ).toInt() ));
r->setColor( readXMLColor( &e, "color", TQt::black ) );
- list->append( r );
+ list->push_back( r );
} else if( e.tagName() == "line" ) {
#warning "TODO: test legacy loading of lines"
LineItem* cl = new LineItem();
@@ -192,7 +191,7 @@ void XMLUtils::readDocumentItems( DocumentItemList* list, TQDomDocument* doc, To
cl->setZ( e.attribute( "z", "0" ).toInt() );
cl->setPen( TQPen( readXMLColor( &e, "color", TQt::black ),
e.attribute( "width", "0" ).toInt(), (TQPen::PenStyle)e.attribute( "style", "0" ).toInt() ) );
- list->append( cl );
+ list->push_back( cl );
}
n = n.nextSibling();
}
@@ -205,7 +204,7 @@ void XMLUtils::readDocumentItems( DocumentItemList* list, TQDomDocument* doc, To
{
DocumentItem* item = NULL;
if( readXMLDocumentItem( &e, &item, token ) )
- list->append( item );
+ list->push_back( item );
}
n = n.nextSibling();
}
diff --git a/kbarcode/xmlutils.h b/kbarcode/xmlutils.h
index 4851baa..5788acf 100644
--- a/kbarcode/xmlutils.h
+++ b/kbarcode/xmlutils.h
@@ -19,7 +19,7 @@
#define XMLUTILS_H
#include <tqmap.h>
-#include <tqsortedlist.h>
+#include <vector>
class DocumentItem;
class BarcodeItem;
@@ -34,7 +34,7 @@ class TQDomNode;
class TQRect;
class TQString;
class TQWidget;
-typedef TQSortedList<DocumentItem> DocumentItemList;
+typedef std::vector<DocumentItem*> DocumentItemList;
/** This class provides helper function for saving and reading to XML files.
*
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
deleted file mode 100644
index ad36a01..0000000
--- a/po/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
-
-if( _srcs )
- tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
-endif( )
diff --git a/po/Makefile.am b/po/Makefile.am
deleted file mode 100644
index dedc9f3..0000000
--- a/po/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = kbarcode.pot de.po el.po es.po fi.po fr.po hu.po it.po kbarcode.pot nl.po pl.po sv.po tr.po
-POFILES = AUTO
diff --git a/stamp-h.in b/stamp-h.in
deleted file mode 100644
index e69de29..0000000
--- a/stamp-h.in
+++ /dev/null
diff --git a/subdirs b/subdirs
deleted file mode 100644
index 1d55bf8..0000000
--- a/subdirs
+++ /dev/null
@@ -1,4 +0,0 @@
-doc
-fileplugin
-kbarcode
-po
diff --git a/translations/desktop_files/de.po b/translations/desktop_files/de.po
new file mode 100644
index 0000000..b45fc78
--- /dev/null
+++ b/translations/desktop_files/de.po
@@ -0,0 +1,93 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:33+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#. Comment
+#: fileplugin/tdefile_kbarcode.desktop:3 fileplugin/tdefile_kbarcode.desktop:4
+msgid "KBarcode Info"
+msgstr ""
+
+#. Comment
+#: kbarcode/kbarcode-batch.desktop:6
+msgid "Barcode and label printing tool (batch printing mode)"
+msgstr "Werkzeug zum Barcode und Etiketten Druck (Stapelverarbeitung)"
+
+#. Name
+#: kbarcode/kbarcode-batch.desktop:8
+msgid "KBarcode Batch Printer"
+msgstr "KBarcode Batch Druck"
+
+#. GenericName
+#: kbarcode/kbarcode-batch.desktop:9
+#, fuzzy
+msgid "Barcode and Label Batch Printer"
+msgstr "Strichcode- und Etikettendruck"
+
+#. Comment
+#: kbarcode/kbarcode-editor.desktop:6
+msgid "Barcode and label printing tool editor"
+msgstr "Werkzeug zum Barcode und Etiketten Druck Editor"
+
+#. Name
+#: kbarcode/kbarcode-editor.desktop:8
+msgid "KBarcode Label Editor"
+msgstr "KBarcode Label Editor"
+
+#. GenericName
+#: kbarcode/kbarcode-editor.desktop:9
+#, fuzzy
+msgid "Barcode and Label Editor"
+msgstr "KBarcode Label Editor"
+
+#. Comment
+#. GenericName
+#: kbarcode/kbarcode-label.desktop:3 kbarcode/kbarcode-label.desktop:8
+#, fuzzy
+msgid "KBarcode Label"
+msgstr "KBarcode Label Editor"
+
+#. Comment
+#: kbarcode/kbarcode-single.desktop:6
+msgid "Barcode generation tool"
+msgstr "Barcode Erstellung"
+
+#. Name
+#: kbarcode/kbarcode-single.desktop:8
+msgid "KBarcode Barcode Generator"
+msgstr "KBarcode Barcode Generator"
+
+#. GenericName
+#: kbarcode/kbarcode-single.desktop:9
+#, fuzzy
+msgid "Barcode Generator"
+msgstr "KBarcode Barcode Generator"
+
+#. Name
+#: kbarcode/kbarcode.desktop:10
+msgid "KBarcode"
+msgstr ""
+
+#. GenericName
+#: kbarcode/kbarcode.desktop:12
+msgid "Barcode and Label Printing"
+msgstr "Strichcode- und Etikettendruck"
+
+#. Comment
+#: kbarcode/kbarcode.desktop:14
+msgid "Barcode and label printing tool"
+msgstr "Werkzeug zum Strichcode- und Etikettendruck"
diff --git a/translations/desktop_files/kbarcode-desktops.pot b/translations/desktop_files/kbarcode-desktops.pot
new file mode 100644
index 0000000..1bb349c
--- /dev/null
+++ b/translations/desktop_files/kbarcode-desktops.pot
@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:33+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#. Comment
+#: fileplugin/tdefile_kbarcode.desktop:3 fileplugin/tdefile_kbarcode.desktop:4
+msgid "KBarcode Info"
+msgstr ""
+
+#. Comment
+#: kbarcode/kbarcode-batch.desktop:6
+msgid "Barcode and label printing tool (batch printing mode)"
+msgstr ""
+
+#. Name
+#: kbarcode/kbarcode-batch.desktop:8
+msgid "KBarcode Batch Printer"
+msgstr ""
+
+#. GenericName
+#: kbarcode/kbarcode-batch.desktop:9
+msgid "Barcode and Label Batch Printer"
+msgstr ""
+
+#. Comment
+#: kbarcode/kbarcode-editor.desktop:6
+msgid "Barcode and label printing tool editor"
+msgstr ""
+
+#. Name
+#: kbarcode/kbarcode-editor.desktop:8
+msgid "KBarcode Label Editor"
+msgstr ""
+
+#. GenericName
+#: kbarcode/kbarcode-editor.desktop:9
+msgid "Barcode and Label Editor"
+msgstr ""
+
+#. Comment
+#. GenericName
+#: kbarcode/kbarcode-label.desktop:3 kbarcode/kbarcode-label.desktop:8
+msgid "KBarcode Label"
+msgstr ""
+
+#. Comment
+#: kbarcode/kbarcode-single.desktop:6
+msgid "Barcode generation tool"
+msgstr ""
+
+#. Name
+#: kbarcode/kbarcode-single.desktop:8
+msgid "KBarcode Barcode Generator"
+msgstr ""
+
+#. GenericName
+#: kbarcode/kbarcode-single.desktop:9
+msgid "Barcode Generator"
+msgstr ""
+
+#. Name
+#: kbarcode/kbarcode.desktop:10
+msgid "KBarcode"
+msgstr ""
+
+#. GenericName
+#: kbarcode/kbarcode.desktop:12
+msgid "Barcode and Label Printing"
+msgstr ""
+
+#. Comment
+#: kbarcode/kbarcode.desktop:14
+msgid "Barcode and label printing tool"
+msgstr ""
diff --git a/translations/desktop_files/nl.po b/translations/desktop_files/nl.po
new file mode 100644
index 0000000..9e2f3f7
--- /dev/null
+++ b/translations/desktop_files/nl.po
@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Heimen Stoffels <vistausss@outlook.com>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:33+0000\n"
+"PO-Revision-Date: 2020-10-09 08:28+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"applications/kbarcode-desktop-files/nl/>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.2.2\n"
+
+#. Name
+#. Comment
+#: fileplugin/tdefile_kbarcode.desktop:3 fileplugin/tdefile_kbarcode.desktop:4
+msgid "KBarcode Info"
+msgstr "KBarcode-informatie"
+
+#. Comment
+#: kbarcode/kbarcode-batch.desktop:6
+msgid "Barcode and label printing tool (batch printing mode)"
+msgstr "Een programma om barcodes en labels mee af te drukken (in reeksen)"
+
+#. Name
+#: kbarcode/kbarcode-batch.desktop:8
+msgid "KBarcode Batch Printer"
+msgstr "KBarcode - reeksen afdrukken"
+
+#. GenericName
+#: kbarcode/kbarcode-batch.desktop:9
+msgid "Barcode and Label Batch Printer"
+msgstr "Reeksen barcodes en labels afdrukken"
+
+#. Comment
+#: kbarcode/kbarcode-editor.desktop:6
+msgid "Barcode and label printing tool editor"
+msgstr "Barcodes en labels bewerken"
+
+#. Name
+#: kbarcode/kbarcode-editor.desktop:8
+msgid "KBarcode Label Editor"
+msgstr "KBarcode-labelbewerker"
+
+#. GenericName
+#: kbarcode/kbarcode-editor.desktop:9
+msgid "Barcode and Label Editor"
+msgstr "Barcode- en labelbewerker"
+
+#. Comment
+#. GenericName
+#: kbarcode/kbarcode-label.desktop:3 kbarcode/kbarcode-label.desktop:8
+msgid "KBarcode Label"
+msgstr "KBarcode-label"
+
+#. Comment
+#: kbarcode/kbarcode-single.desktop:6
+msgid "Barcode generation tool"
+msgstr "Barcodes genereren"
+
+#. Name
+#: kbarcode/kbarcode-single.desktop:8
+msgid "KBarcode Barcode Generator"
+msgstr "KBarcode-barcodegenerator"
+
+#. GenericName
+#: kbarcode/kbarcode-single.desktop:9
+msgid "Barcode Generator"
+msgstr "Barcodegenerator"
+
+#. Name
+#: kbarcode/kbarcode.desktop:10
+msgid "KBarcode"
+msgstr "KBarcode"
+
+#. GenericName
+#: kbarcode/kbarcode.desktop:12
+msgid "Barcode and Label Printing"
+msgstr "Barcodes en labels afdrukken"
+
+#. Comment
+#: kbarcode/kbarcode.desktop:14
+msgid "Barcode and label printing tool"
+msgstr "Barcodes en labels afdrukken"
diff --git a/po/de.po b/translations/messages/de.po
index 019b16f..85312b8 100644
--- a/po/de.po
+++ b/translations/messages/de.po
@@ -8,31 +8,33 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
-"PO-Revision-Date: 2007-10-13 15:30+0200\n"
-"Last-Translator: Dominik Seichter <domseichter@web.de>\n"
-"Language-Team: <de@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
+"PO-Revision-Date: 2019-12-22 22:59+0000\n"
+"Last-Translator: Chris <xchrisx@uber.space>\n"
+"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kbarcode/de/>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr "Dominik Seichter"
+msgstr "Dominik Seichter, Chris (TDE)"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr "domseichter@web.de"
+msgstr "domseichter@web.de, (Keine Email)"
#: barcodecombo.cpp:121
msgid "&Encoding Type:"
-msgstr "&Codierungs Art:"
+msgstr "&Kodierung:"
#: barcodecombo.cpp:130
msgid "&Value:"
@@ -56,7 +58,7 @@ msgstr "&Rand:"
#: barcodecombo.cpp:173 propertywidget.cpp:140 propertywidget.cpp:466
msgid "&Rotation:"
-msgstr "&Rotation:"
+msgstr "&Drehung:"
#: barcodecombo.cpp:180
msgid "&Scale (in permille):"
@@ -68,7 +70,7 @@ msgstr "&Abschneiden:"
#: barcodedialog.cpp:46
msgid "Barcode Generator"
-msgstr "Barcode Generator"
+msgstr "Strichcode Generator"
#: barcodedialog.cpp:57
msgid "&Generate"
@@ -84,7 +86,7 @@ msgstr "Fehler beim speichern des Bildes"
#: barcodedialogs.cpp:43
msgid "Barcode Settings"
-msgstr "Barcode Einstellungen"
+msgstr "Strichcode Einstellungen"
#: barcodedialogs.cpp:49 barcodedialogs.cpp:254
msgid "PDF417"
@@ -116,7 +118,7 @@ msgstr "Modul Breite (mm):"
#: barcodedialogs.cpp:120
msgid "Barcode Height (mm):"
-msgstr "Barcode Höhe (in mm):"
+msgstr "Strichcode Höhe (in mm):"
#: barcodedialogs.cpp:123
msgid "&Translate escape sequences"
@@ -124,7 +126,7 @@ msgstr "&Escape Sequenzen übersetzen"
#: barcodedialogs.cpp:124
msgid "&Text above barcode"
-msgstr "&Text über dem Barcode"
+msgstr "&Text über dem Strichcode"
#: barcodedialogs.cpp:125
msgid "&Auto correction"
@@ -285,7 +287,7 @@ msgstr "Prüfsumme &anschalten"
#: barcodeprinterdlg.cpp:31
msgid "Barcode Printer"
-msgstr "Barcode Drucker"
+msgstr "Strichcode Drucker"
#: barcodeprinterdlg.cpp:36
msgid "&Output Format:"
@@ -401,7 +403,7 @@ msgstr "UPC (12-stelliges EAN; UPCA und UPCB)"
#: barkode.cpp:716
msgid "pdf 417 2D Barcode"
-msgstr "pdf 417 2D Barcode"
+msgstr "pdf 417 2D Strichcode"
#: batchprinter.cpp:111 batchprinter.cpp:341
msgid "Printing..."
@@ -431,9 +433,9 @@ msgid ""
"with KBarcode.<br>The first step is to select the KBarcode label file you "
"want to print.</qt>"
msgstr ""
-"<qt>Dieser Assistent wird Sie beim Drucken von mehreren Labels mit KBarcode "
-"begleiten und Ihnen helfen.<br>Der erste Schritt ist es die KBarcode Label "
-"Datei auszuwählen, die Sie drucken wollen.</qt> "
+"<qt>Dieser Assistent wird Sie beim Drucken von mehreren Etiketten mit "
+"KBarcode begleiten und Ihnen helfen.<br>Der erste Schritt ist es die "
+"KBarcode Etiketten Datei auszuwählen, die Sie drucken wollen.</qt>"
#: batchwizard.cpp:135
msgid "File Selection"
@@ -441,7 +443,7 @@ msgstr "Datei Auswahl"
#: batchwizard.cpp:147
msgid "Print &labels without data"
-msgstr "&Labels ohne Daten drucken"
+msgstr "&Etiketten ohne Daten drucken"
#: batchwizard.cpp:148
msgid "Print &articles from KBarcodes SQL database"
@@ -483,11 +485,11 @@ msgid ""
"least one number. This number is increased for every printed label on the "
"print out.</qt>"
msgstr ""
-"<qt>KBarcode kann fortlaufende Seriennummern auf die Label drucken. Wenn Sie "
-"das Kommando [seriel] nirgends auf Ihrem Label verwendet haben, können Sie "
-"diese Seite überspringen.<br>Start ist ein beliebiger Ausdruck der "
-"mindestens eine Zahl enthalten muss. Diese Zahl wird für jedes gedruckte "
-"Label auf dem Ausdruck erhöht.</qt> "
+"<qt>KBarcode kann fortlaufende Seriennummern auf die Etiketten drucken. Wenn "
+"Sie das Kommando [seriel] nirgends auf Ihrer Etikette verwendet haben, "
+"können Sie diese Seite überspringen.<br>Start ist ein beliebiger Ausdruck "
+"der mindestens eine Zahl enthalten muss. Diese Zahl wird für jede gedruckte "
+"Etikette auf dem Ausdruck erhöht.</qt>"
#: batchwizard.cpp:216 previewdialog.cpp:104
msgid "Serial start:"
@@ -511,7 +513,7 @@ msgstr "&Bilder erstellen"
#: batchwizard.cpp:239
msgid "Print to a special &barcode printer"
-msgstr "Auf einen speziellen &Barcode Drucker drucken"
+msgstr "Auf einen speziellen &Strichcode Drucker drucken"
#: batchwizard.cpp:243
msgid "Output &Directory:"
@@ -527,7 +529,7 @@ msgstr "&Artikel Nummer als Dateiname verwenden"
#: batchwizard.cpp:260
msgid "Use &barcode number for filename"
-msgstr "&Barcode Nummer als Dateiname verwenden"
+msgstr "&Strichcode Nummer als Dateiname verwenden"
#: batchwizard.cpp:261
msgid "Use &custom filename:"
@@ -535,7 +537,7 @@ msgstr "&Benutzerspezifischen Dateinamen verwenden:"
#: batchwizard.cpp:269
msgid "&Keep window open after printing."
-msgstr "&Fenster auch nach dem Drucken geöffnet lassen"
+msgstr "&Fenster auch nach dem Drucken geöffnet lassen."
#: batchwizard.cpp:287
msgid "Output Device"
@@ -579,7 +581,7 @@ msgstr "Index"
#: batchwizard.cpp:319
msgid "Number of Labels"
-msgstr "Anzahl der Labels"
+msgstr "Anzahl der Etiketten"
#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
#: configdialog.cpp:169
@@ -613,7 +615,7 @@ msgstr "Bitte wählen Sie eine CSV &Datei:"
#: batchwizard.cpp:353
msgid "&Encoding:"
-msgstr "&Codierungs Art:"
+msgstr "&Kodierung:"
#: batchwizard.cpp:362
msgid "Available Variables:"
@@ -621,7 +623,7 @@ msgstr "Verfügbare Variablen:"
#: batchwizard.cpp:380
msgid "&Number of labels to print:"
-msgstr "&Anzahl der Labels die gedruckt werden sollen:"
+msgstr "&Anzahl der Etiketten die gedruckt werden sollen:"
#: batchwizard.cpp:411
msgid "Add all contacts to the list of contacts which will be printed."
@@ -669,7 +671,7 @@ msgstr "Email Addresse"
#: batchwizard.cpp:561
msgid "The label file %1 was not found"
-msgstr "Die Label Datei %1 konnte nicht gefunden werden."
+msgstr "Die Etiketten Datei %1 konnte nicht gefunden werden."
#: batchwizard.cpp:743
msgid "Please enter a valid article ID"
@@ -684,11 +686,11 @@ msgstr ""
msgid "<qt>The following items can not be added:"
msgstr "<qt>Die folgenden Werte konnten nicht geladen werden:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>Kann die SQL Anfrage nicht ausführen:<br>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr "Kann die Datei nicht öffnen: %1"
@@ -711,75 +713,67 @@ msgstr "Neue Textzeile"
#: commands.cpp:492
msgid "New Barcode"
-msgstr "Neuer Barcode"
+msgstr "Neuer Strichcode"
#: commands.h:142
-#, fuzzy
msgid "Resized Item"
-msgstr "Element geschützt"
+msgstr "In der Größe verändertes Element"
#: commands.h:170
-#, fuzzy
msgid "Moved Item"
-msgstr "Element geschützt"
+msgstr "Verschobenes Element"
#: commands.h:185
msgid "Raised or lowered an item"
-msgstr ""
+msgstr "Erhöhtes oder gesenktes Element"
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
msgid "Protected Item"
msgstr "Element geschützt"
#: commands.h:221
-#, fuzzy
msgid "Changed Settings"
-msgstr "Barcode Einstellungen"
+msgstr "Veränderte Einstellungen"
#: commands.h:244 commands.h:276
-#, fuzzy
msgid "Changed Text"
-msgstr "Neuer Text"
+msgstr "Veränderter Text"
#: commands.h:258
-#, fuzzy
msgid "Rotated Text"
-msgstr "Neuer Text"
+msgstr "Rotierter Text"
#: commands.h:297
-#, fuzzy
msgid "Changed Barcode"
-msgstr "KBarcode Einrichtung..."
+msgstr "Veränderter Strichcode"
#: commands.h:308
-#, fuzzy
msgid "New Picture"
-msgstr "&Bild Einfügen"
+msgstr "Neues Bild"
#: commands.h:377
-#, fuzzy
msgid "Delete Item"
-msgstr "Reihe löschen"
+msgstr "Element löschen"
#: commands.h:388
msgid "Modified Border"
-msgstr ""
+msgstr "Veränderte Umrandung"
#: commands.h:407
msgid "Modified Rectangle or Ellipse"
-msgstr ""
+msgstr "Verändertes Rechteck oder Ellipse"
#: commands.h:427
msgid "Changed visibility JavaScript"
-msgstr ""
+msgstr "Veränderte JavaScript-Sichtbarkeit"
#: configdialog.cpp:46
msgid "There are currently %1 cached barcodes."
-msgstr "Es sind %1 Barcodes im Cache."
+msgstr "Es sind %1 Strichcodes im Cache."
#: configdialog.cpp:50 confwizard.cpp:59
msgid "Configure KBarcode"
-msgstr "KBarcode Einrichtung..."
+msgstr "KBarcode einrichten"
#: configdialog.cpp:66
msgid "SQL Settings"
@@ -835,11 +829,11 @@ msgstr "Menge"
#: configdialog.cpp:186
msgid "Label Editor"
-msgstr "Label Editor"
+msgstr "Etiketten Editor"
#: configdialog.cpp:190
msgid "&Create a new label on startup"
-msgstr "Bei Label Editor Start &nach neuen Label fragen"
+msgstr "Bei Etiketten Editor Start &nach neuer Etikette fragen"
#: configdialog.cpp:198
msgid "Grid:"
@@ -871,7 +865,7 @@ msgstr "Neue Zeile"
#: configdialog.cpp:228 configdialog.cpp:234
msgid "Insert Label X"
-msgstr "X Label einfügen"
+msgstr "X Etiketten einfügen"
#: configdialog.cpp:229 configdialog.cpp:235
msgid "New Page"
@@ -905,15 +899,16 @@ msgid ""
"xbarcode replacement for the creation of barcodes. All major types of "
"barcodes like EAN, UPC, CODE39 and ISBN are supported."
msgstr ""
-"KBarcode ist eine Barcode und Label Anwendung für TDE. Es kann von simplen "
-"Visitenkarten bis zu komplexen Labels mit mehreren Barcodes (z.B. Artikel "
-"Beschreibungen) alles drucken. KBarcode hat einen einfach zu benutzenden "
-"WYSIWYG Label Designer, einen Einstellungs Assistenten, Batch Import von "
-"Labels (direkt vom Bestellungs Eingang), über 1000 Labeldefinitionen, "
-"Datenbank Werkzeuge und Übersetzungen in viele Sprachen. Nicht einmal das "
-"drucken von mehr als 10.000 Labels ist ein Problem für KBarcode. Außerdem "
-"ist es ein einfacher xbarcode Ersatz zum erstellen von Barcodes. Alle "
-"bekannten Barcode Formate wie EAN, UPC, CODE39 und ISBN werden unterstützt."
+"KBarcode ist eine Strichcode- und Etikettenprogramm für TDE. Es kann von "
+"simplen Visitenkarten bis zu komplexen Etiketten mit mehreren Strichcodes (z."
+"B. Artikel Beschreibungen) alles drucken. KBarcode hat einen einfach zu "
+"benutzenden WYSIWYG Etiketten Designer, einen Einstellungs Assistenten, "
+"Batch Import von Etiketten (direkt vom Bestellungs Eingang), über 1000 "
+"Etikettendefinitionen, Datenbank Werkzeuge und Übersetzungen in viele "
+"Sprachen. Nicht einmal das drucken von mehr als 10.000 Etiketten ist ein "
+"Problem für KBarcode. Außerdem ist es ein einfacher xbarcode Ersatz zum "
+"erstellen von Strichcodes. Alle bekannten Strichcode Formate wie EAN, UPC, "
+"CODE39 und ISBN werden unterstützt."
#: confwizard.cpp:101
msgid "<qt><h1>Welcome to KBarcode</h1><br><br>"
@@ -942,7 +937,7 @@ msgid ""
"tables with some example data."
msgstr ""
"KBarcode kann die benötigten SQL Tabellen für Sie erstellen.<br>KBarcode "
-"wird auch die Label Definition in die Datenbank importieren.<br>Danach "
+"wird auch die Etiketten Definition in die Datenbank importieren.<br>Danach "
"können Sie auch Beispiel Daten in die Datenbank importieren."
#: confwizard.cpp:160 dsmainwindow.cpp:78
@@ -966,16 +961,15 @@ msgid "Example data has been imported."
msgstr "Beispiel Daten wurden importiert."
#: confwizard.cpp:236
-#, fuzzy
msgid ""
"There are no TQt SQL drivers installed. KBarcode needs those drivers to "
"access the different SQL databases. This drivers are part of the TQt Source "
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Es sind keine Qt SQL Treiber installiert. KBarcode braucht diese Treiber um "
+"Es sind keine TQt SQL Treiber installiert. KBarcode braucht diese Treiber um "
"die verschiedenen SQL Datenbanken anzusprechen. Diese Treiber sind Teil der "
-"Qt Quellcode Distribution und sollten auch in ihrer Distribution enthalten "
+"TQt Quellcode Distribution und sollten auch in ihrer Distribution enthalten "
"sein. Bitte installieren Sie zuerst die Treiber."
#: csvimportdlg.cpp:61
@@ -1020,7 +1014,7 @@ msgstr "Datei zum importieren:"
#: csvimportdlg.cpp:133
msgid "Encoding:"
-msgstr "Codierungs Art:"
+msgstr "Kodierung:"
#: csvimportdlg.cpp:135
msgid "Import into table:"
@@ -1032,7 +1026,7 @@ msgstr "Tabellen Name:"
#: csvimportdlg.cpp:151
msgid "&Import Settings"
-msgstr "Einstellungen &importiere "
+msgstr "Einstellungen &importieren"
#: csvimportdlg.cpp:157
msgid "&CSV File"
@@ -1085,14 +1079,14 @@ msgid ""
"is part of the KBarcode distribution. You will be prompted now to select the "
"file containing the labeldefinitions."
msgstr ""
-"KBarcode kann die Label Definitionen nicht finden. Bitte stellen Sie sicher, "
-"dass die Datei $TDEDIR/share/apps/kbarcode/labeldefinitions.sql existiert. "
-"Diese Datei ist Teil der KBarcode Distribution. Sie werden jetzt nach einer "
-"Datei gefragt die die Label Definitionen enthält."
+"KBarcode kann die Etiketten Definitionen nicht finden. Bitte stellen Sie "
+"sicher, dass die Datei $TDEDIR/share/apps/kbarcode/labeldefinitions.sql "
+"existiert. Diese Datei ist Teil der KBarcode Distribution. Sie werden jetzt "
+"nach einer Datei gefragt die die Etiketten Definitionen enthält."
#: definitiondialog.cpp:82
msgid "Add Label Definition"
-msgstr "Label Definition hinzufügen"
+msgstr "Etiketten Definition hinzufügen"
#: definitiondialog.cpp:91 newlabel.cpp:64
msgid "Producer:"
@@ -1160,11 +1154,11 @@ msgstr "Benutzerdefiniert"
#: definitiondialog.cpp:398
msgid "Number of horizontal Labels"
-msgstr "Horizontale Label"
+msgstr "Horizontale Etiketten"
#: definitiondialog.cpp:400
msgid "Number of vertical Labels"
-msgstr "Vertikale Label"
+msgstr "Vertikale Etiketten"
#: definitiondialog.cpp:404
msgid "Gap Top"
@@ -1182,45 +1176,45 @@ msgstr "Vertikaler Abstand"
msgid "Horizontal Gap"
msgstr "Horizontaler Abstand"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
msgid "&Position && Size"
msgstr "&Position && Größe"
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
msgid "&Border"
msgstr "&Rand"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
msgid "&Fill Color"
-msgstr "&Füll Farbe:"
+msgstr "&Füllfarbe"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
-msgstr "&Barcode"
+msgstr "&Strichcode"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
msgid "&Rotation"
-msgstr "&Rotation"
+msgstr "&Drehung"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
msgid "&Text"
msgstr "&Text"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
msgid "&Image"
msgstr "&Bild"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr "&Sichtbarkeit"
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
msgid "Property changed"
msgstr "Eigenschaft geändert"
#: dsmainwindow.cpp:71
msgid "&Start Configuration Wizard..."
-msgstr "Einrichtungs Assistent &Starten..."
+msgstr "Einrichtungsassistent &starten ..."
#: dsmainwindow.cpp:74
msgid "&Connect to Database"
@@ -1228,7 +1222,7 @@ msgstr "&Datenbank Verbindung"
#: dsmainwindow.cpp:81
msgid "&Import Label Definitions"
-msgstr "&Label Definitionen Importieren"
+msgstr "&Etiketten Definitionen Importieren"
#: dsmainwindow.cpp:84
msgid "&Import Example Data"
@@ -1236,7 +1230,7 @@ msgstr "&Beispiel Daten Importieren"
#: dsmainwindow.cpp:94
msgid "&Barcode Help..."
-msgstr "&Barcode Hilfe..."
+msgstr "&Strichcode Hilfe..."
#: dsmainwindow.cpp:96
msgid "&Donate..."
@@ -1247,25 +1241,23 @@ msgid "&System Check..."
msgstr "&System Überprüfung..."
#: dsmainwindow.cpp:180
-#, fuzzy
msgid ""
"<qt>The KBarcode documentation is avaible as PDF for download here.<br><br>"
msgstr ""
-"<qt>Die KBarcode Dokumentation kann als PDF Datei von der KBarcode Webseite "
-"heruntergeladen werden.<br><br>"
+"<qt>Die KBarcode Dokumentation kann von hier als PDF-Datei heruntergeladen "
+"werden.<br><br>"
#: dsmainwindow.cpp:182
msgid "Download Now"
msgstr "Jetzt Herunterladen"
#: dsmainwindow.cpp:211
-#, fuzzy
msgid ""
"<qt>It is possible to support the further development of KBarcode through "
"donations.<br><br>"
msgstr ""
-"<qt>Sie können die weitere Entwicklung von KBarcode durch Spenden fördern. "
-"PayPal wird zur Abwicklung der Spenden verwendet.<br><br>"
+"<qt>Sie können die weitere Entwicklung von KBarcode durch Spenden fördern."
+"<br><br>"
#: dsmainwindow.cpp:213
msgid "Donate Now"
@@ -1273,7 +1265,7 @@ msgstr "Jetzt spenden"
#: dsmainwindow.cpp:226
msgid "<p><h3>Barcode Support</h3></p>"
-msgstr "<p><h3>Barcode Unterstützung</h3></p>"
+msgstr "<p><h3>Strichcode Unterstützung</h3></p>"
#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
#: dsmainwindow.cpp:234 dsmainwindow.cpp:236
@@ -1290,7 +1282,7 @@ msgid ""
"<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</i>, "
"<i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
msgstr ""
-"<p>Um <b>Barcode Unterstützung</b> zu erhalten müssen Sie entweder <i>GNU "
+"<p>Um <b>Strichcode Unterstützung</b> zu erhalten müssen Sie entweder <i>GNU "
"Barcode</i>, <i>TBarcode</i> oder <i>PDF417 Enc</i> installieren.</p>"
#: dsmainwindow.cpp:241
@@ -1314,11 +1306,11 @@ msgstr "Ausdruck: "
#: kbarcode.cpp:51
msgid "Barcode &Generator..."
-msgstr "Barcode &Generator..."
+msgstr "Strichcode &Generator..."
#: kbarcode.cpp:53
msgid "&Label Editor..."
-msgstr "&Label Editor..."
+msgstr "&Etiketten Editor..."
#: kbarcode.cpp:54
msgid "&Batch Printing..."
@@ -1330,7 +1322,7 @@ msgstr "SQL &Tabellen Bearbeiten..."
#: kbarcode.cpp:75
msgid "&Edit Label Definitions"
-msgstr "&Label Definitionen Bearbeiten"
+msgstr "&Etiketten Definitionen Bearbeiten"
#: kbarcode.cpp:78
msgid "&Edit Articles"
@@ -1350,15 +1342,15 @@ msgid ""
"IMAGE and BARCODE."
msgstr ""
"%1 ist kein gültiges Ausgabe Format für --output. Gültige Werte sind "
-"POSTSCRIPT, IMAGE und BARCODE. "
+"POSTSCRIPT, IMAGE und BARCODE."
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Fest"
#: labeleditor.cpp:348
msgid "Select Label"
-msgstr "Label Auswahl"
+msgstr "Etiketten Auswahl"
#: labeleditor.cpp:385
msgid ""
@@ -1366,11 +1358,11 @@ msgid ""
"qt>"
msgstr ""
"<qt>Die Datei <b>%1</b> kann nicht geladen werden, da die dafür benötigten "
-"Label Definitionen fehlen.</qt>"
+"Etiketten Definitionen fehlen.</qt>"
#: labeleditor.cpp:444
msgid "Close &Label"
-msgstr "Label Schl&ießen"
+msgstr "Etikette Schl&ießen"
#: labeleditor.cpp:446
msgid "&Recent Files"
@@ -1390,7 +1382,7 @@ msgstr "&Objekt Löschen"
#: labeleditor.cpp:456
msgid "Print to &Barcode Printer..."
-msgstr "Auf &Barcode Drucker drucken..."
+msgstr "Auf &Strichcode Drucker drucken..."
#: labeleditor.cpp:457
msgid "Print to &Image..."
@@ -1398,11 +1390,11 @@ msgstr "Bilder &erstellen..."
#: labeleditor.cpp:458
msgid "&Change Label..."
-msgstr "Label &Ändern..."
+msgstr "Etikette &Ändern..."
#: labeleditor.cpp:459
msgid "Insert &Barcode"
-msgstr "&Barcode Einfügen"
+msgstr "&Strichcode Einfügen"
#: labeleditor.cpp:462
msgid "Insert &Picture"
@@ -1446,7 +1438,7 @@ msgstr "Adreß&buch"
#: labeleditor.cpp:479
msgid "&Create Single Barcode..."
-msgstr "&Einzelnen Barcode Erstellen..."
+msgstr "&Einzelnen Strichcode Erstellen..."
#: labeleditor.cpp:522
msgid "T&ools"
@@ -1492,31 +1484,31 @@ msgstr "&Position und Größe schützen"
msgid "&Properties"
msgstr "&Eigenschaften"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
-msgstr "Label Beschreibung"
+msgstr "Etiketten Beschreibung"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Bitte geben Sie eine Beschreibung ein:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Größe: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
-msgstr "Label Vorlage: "
+msgstr "Etiketten Vorlage: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Rechtschreibprüfung"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "Die Datei %1 existiert nicht."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr ""
@@ -1553,15 +1545,15 @@ msgstr "KBarcode als xbarcode Ersatz starten"
#: main.cpp:41
msgid "Open the label editor"
-msgstr "Den Label Editor starten"
+msgstr "Den Etiketten Editor starten"
#: main.cpp:42
msgid "Start directly in batchprinting mode"
-msgstr "direkt in den Batch Druck Modus starten"
+msgstr "Direkt in den Stapeldruckmodus starten"
#: main.cpp:43
msgid "Additional options for batchprinting (--batch):"
-msgstr "Zusätzliche optionen für den Batch Druck (--batch)"
+msgstr "Zusätzliche optionen für den Batch Druck (--batch):"
#: main.cpp:44
msgid "Output format where mode is one of POSTSCRIPT|IMAGE|BARCODE"
@@ -1577,7 +1569,7 @@ msgid ""
"Increase a previously specified serial number using this value for each "
"printed label"
msgstr ""
-"Eine vorher angegebene Seriennummer um diesen Wert für jedes Label erhöhen"
+"Eine vorher angegebene Seriennummer um diesen Wert für jede Etikette erhöhen"
#: main.cpp:47
msgid "Print <value> labels without any data"
@@ -1597,83 +1589,83 @@ msgstr "KBarcode"
#: main.cpp:85
msgid "KBarcode is a barcode and label printing application for TDE."
-msgstr "KBarcode ist eine Barcode und Label Anwendung für TDE."
+msgstr "KBarcode ist eine Strichcode- und Etikettenprogramm für TDE."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Programmierer"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
-msgstr "Projekt Manager"
+msgstr "Projektverwaltung"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "Hat GNU Barcode geschrieben, auf welchem KBarcode basiert."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr "Author von Barcode Writer in Pure Postscript"
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Italienische Übersetzung"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Finnische und Schwedische Übersetzung, sowie das KBarcode Symbol"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Spanische Übersetzung"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Ungarische Übersetzung"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Tab Icon Code aus qtella."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "Hat das RichText KPart geschrieben."
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Französische Übersetzung"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "Hat mir mit ZPL und IPL geholfen."
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr "Hat viele Patches geschrieben um KBarcode zu verbessern"
-#: main.cpp:110
+#: main.cpp:108
msgid "Made the Netherlands translation"
msgstr "Niederländische Übersetzung"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr "Hat viele nützliche Datenfelder zu KBarcode hinzugefügt"
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
-msgstr "Hat die TEC Barcode Drucker Unterstüzung beigesteuert"
+msgstr "Hat die TEC Strichcode Drucker Unterstüzung beigesteuert"
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
-msgstr "Hat EPCL Barcode Drucker Unterstüzung hinzugefügt"
+msgstr "Hat EPCL Strichcode Drucker Unterstüzung hinzugefügt"
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
-msgstr ""
+msgstr "Schrieb Fehlerbehebungen."
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
-msgstr ""
+msgstr "Betreuer (TDE Projekt)"
#: measurements.cpp:51
msgid "mm"
@@ -1701,7 +1693,7 @@ msgstr "&Unterstrichen"
#: multilineeditdlg.cpp:104
msgid "Text &Color..."
-msgstr "Text &Farbe"
+msgstr "&Textfarbe ..."
#: multilineeditdlg.cpp:109
msgid "&Font"
@@ -1737,27 +1729,27 @@ msgstr "Element verschoben"
#: newlabel.cpp:41
msgid "New Label"
-msgstr "Neues Label"
+msgstr "Neue Etikette"
#: newlabel.cpp:49
msgid "<h1>Create a new Label</h1><br><br>"
-msgstr "<h1>Ein neues Label erstellen</h1><br><br>"
+msgstr "<h1>Ein neue Etikette erstellen</h1><br><br>"
#: newlabel.cpp:51
msgid "<h1>Change Label Size</h1><br><br>"
-msgstr "<h1>Label Größe ändern</h1><br><br>"
+msgstr "<h1>Etiketten Größe ändern</h1><br><br>"
#: newlabel.cpp:56 tokenprovider.cpp:208
msgid "Label"
-msgstr "Label"
+msgstr "Etikette"
#: newlabel.cpp:72
msgid "&Start with an empty label"
-msgstr "&Mit einem leeren Label starten"
+msgstr "&Mit einer leeren Etikette starten"
#: newlabel.cpp:102
msgid "&Add own Label Definition"
-msgstr "&Eigene Label Definition hinzufügen"
+msgstr "&Eigene Etiketten Definition hinzufügen"
#: newlabel.cpp:168
msgid ""
@@ -1789,7 +1781,7 @@ msgstr "%5<br>Abstand nach Links: "
#: newlabel.cpp:192
msgid "No label selected."
-msgstr "Kein Label ausgewählt."
+msgstr "Keine Etikette ausgewählt."
#: previewdialog.cpp:89
msgid "Select &Address"
@@ -1929,11 +1921,11 @@ msgstr "US-Tabloid"
#: printlabeldlg.cpp:36 smalldialogs.cpp:42 smalldialogs.cpp:88
msgid "Number of labels:"
-msgstr "Anzahl der Labels:"
+msgstr "Anzahl der Etiketten:"
#: printlabeldlg.cpp:40
msgid "Start at label position:"
-msgstr "Ab Label Position drucken:"
+msgstr "Ab Etiketten Position drucken:"
#: printlabeldlg.cpp:43
msgid "&Print crop marks (borders)"
@@ -1969,7 +1961,7 @@ msgstr "270"
#: propertywidget.cpp:212
msgid "Barcode Settings:"
-msgstr "Barcode Einstellungen:"
+msgstr "Strichcode Einstellungen:"
#: propertywidget.cpp:346
msgid "&Protect item from being moved or resized"
@@ -2052,7 +2044,7 @@ msgstr "Rand:"
#: smalldialogs.cpp:35
msgid "Add Barcode_basic"
-msgstr "barcode_basic hinzufügen"
+msgstr "Strichcode_basic hinzufügen"
#: smalldialogs.cpp:61
msgid "Add Items"
@@ -2089,16 +2081,16 @@ msgstr ""
"</qt>"
#: sqltables.cpp:183
-#, fuzzy
msgid "<qt>Can't connect to database to create table."
-msgstr "Kann keine Datenbank Verbindung aufbauen."
+msgstr ""
+"<qt>Verbindung zur Datenbank zum Erstellen der Tabelle, kann nicht "
+"hergestellt werden."
#: sqltables.cpp:183
-#, fuzzy
msgid "<br>You can continue if the table exists already.</qt>"
msgstr ""
-"<br>Sie können das Erstellen fortsetzen wenn die Datenbank bereits existiert."
-"</qt>"
+"<br>Sie können das Erstellen fortsetzen wenn die Tabelle bereits existiert.</"
+"qt>"
#: sqltables.cpp:195
msgid ""
@@ -2137,7 +2129,7 @@ msgstr "SQL Import Fortschritt:"
#: sqltables.cpp:337
msgid "Can't open the data file containing the label definitions."
-msgstr "Kann die Datei mit den Label Definitionen nicht öffnen."
+msgstr "Kann die Datei mit den Etiketten Definitionen nicht öffnen."
#: sqltables.cpp:346
msgid "<qt>Can't execute command:<br><b>"
@@ -2161,23 +2153,23 @@ msgstr "Datenbank Einstellungen"
#: sqltables.cpp:533
msgid "Username :"
-msgstr "Benutzername :"
+msgstr "Benutzername:"
#: sqltables.cpp:540
msgid "Password :"
-msgstr "Passwort :"
+msgstr "Passwort:"
#: sqltables.cpp:548
msgid "Database :"
-msgstr "Datenbank :"
+msgstr "Datenbank:"
#: sqltables.cpp:555
msgid "Host :"
-msgstr "Host :"
+msgstr "Rechner:"
#: sqltables.cpp:562
msgid "Driver :"
-msgstr "Treiber :"
+msgstr "Treiber:"
#: sqltables.cpp:575
msgid "&Autoconnect on program start"
@@ -2195,11 +2187,11 @@ msgstr ""
#: textlineedit.cpp:130
msgid "&Mag. Vert.:"
-msgstr ""
+msgstr "Senkrechte &Vergrößerung:"
#: textlineedit.cpp:132
msgid "&Mag. Hor.:"
-msgstr ""
+msgstr "Waagerechte &Vergrößerung:"
#: tokendialog.cpp:65 tokendialog.cpp:93 tokendialog.cpp:109
msgid "What do you want to insert?"
@@ -2278,7 +2270,7 @@ msgstr "Beschreibung"
#: tokendialog.cpp:146
msgid "&Custom Expression to be inserted in the token."
msgstr ""
-"&Benutzerspezifischer Ausdruck der in das Kommando eingefügt werden soll"
+"&Benutzerspezifischer Ausdruck der in das Kommando eingefügt werden soll."
#: tokendialog.cpp:151
msgid ""
@@ -2328,7 +2320,7 @@ msgstr "Alle"
#: tokendialog.cpp:352 tokendialog.cpp:420
msgid "Variable defined by the user for this label."
-msgstr "Variablen die von Benutzer für dieses Label definiert wurden."
+msgstr "Variablen die von Benutzer für diese Etikette definiert wurden."
#: tokendialog.cpp:417 tokenprovider.cpp:209
msgid "Custom Values"
@@ -2360,7 +2352,7 @@ msgstr "Name des aktuellen Kunden"
#: tokenprovider.cpp:226
msgid "Barcode number from barcode_basic"
-msgstr "Barcode Nummer aus barcode_basic"
+msgstr "Strichcode Nummer aus Strichcode_basic"
#: tokenprovider.cpp:228
msgid "group of the current article"
@@ -2368,11 +2360,11 @@ msgstr "Gruppe des aktuellen Artikels"
#: tokenprovider.cpp:229
msgid "Barcode encoding type from barcode_basic"
-msgstr "Barcode Codierungs Art aus barcode_basic"
+msgstr "Strichcode-Kodierung aus barcode_basic"
#: tokenprovider.cpp:230
msgid "User readable barcode encoding type from barcode_basic"
-msgstr "Lesbare Barcode Codierungs Art aus barcode_basic"
+msgstr "Lesbare Strichcode-Kodierung aus Strichcode_basic"
#: tokenprovider.cpp:235
msgid "Path and filename of this file"
@@ -2380,7 +2372,7 @@ msgstr "Pfad und Dateiname dieser Datei"
#: tokenprovider.cpp:236
msgid "number of labels currently printed during this printout"
-msgstr "Anzahl der Labels die bisher gedruckt wurden"
+msgstr "Anzahl der Etiketten die bisher gedruckt wurden"
#: tokenprovider.cpp:237
msgid "current column on the page"
@@ -2400,7 +2392,7 @@ msgstr "Auflösung"
#: tokenprovider.cpp:241
msgid "Include a serial number on your labels."
-msgstr "Eine Seriennummer in Ihre Label einfügen"
+msgstr "Eine Seriennummer in Ihre Etiketten einfügen."
#: tokenprovider.cpp:247
msgid "Execute java script code"
@@ -2562,13 +2554,13 @@ msgstr "Formattierte Addresse"
msgid "ERROR: Empty SQL Query"
msgstr "Fehler: Lehre SQL Abfrage"
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
msgstr ""
"<qt>Diese scheint von einer älteren KBarcode Version erstellt worden zu sein."
-"<br> Bitte prüfen Sie ob die Label Definition noch richtig ist:<br><b>"
+"<br> Bitte prüfen Sie ob die Etiketten Definition noch richtig ist:<br><b>"
#, fuzzy
#~ msgid "&Remove"
diff --git a/po/el.po b/translations/messages/el.po
index d44b4b6..60e7375 100644
--- a/po/el.po
+++ b/translations/messages/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: 2004-02-02 19:33+0200\n"
"Last-Translator: Theodore Karkoulis <bilbo@debian.gr>\n"
"Language-Team: Greek <el@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Theodore Karkoulis"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -705,12 +705,12 @@ msgstr "Ο διαχωριστής είναι άδειος. Παρακαλώ δώ
msgid "<qt>The following items can not be added:"
msgstr "<qt>Τα παρακάτω αντικείμενα δεν μπορούν να προστεθούν:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
#, fuzzy
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>Αδυναμία εκτέλεσης εντολής:<br><b>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr ""
@@ -749,7 +749,7 @@ msgstr "Προσθήκη Αντικειμένου"
msgid "Raised or lowered an item"
msgstr ""
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
msgid "Protected Item"
msgstr ""
@@ -994,9 +994,9 @@ msgid ""
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Δεν υπάρχουν εγκατεστημένοι οδηγοί Qt SQL. Το Kbarcode χρειάζεται αυτούς "
+"Δεν υπάρχουν εγκατεστημένοι οδηγοί TQt SQL. Το Kbarcode χρειάζεται αυτούς "
"τους οδηγούς για να αποκτήσει πρόσβαση στις βάσεις δεδομένων SQL. Αυτοί οι "
-"οδηγοί είναι μέρος του κώδικα του QT και θα πρέπει να επίσης να αποτελούν "
+"οδηγοί είναι μέρος του κώδικα του TQt και θα πρέπει να επίσης να αποτελούν "
"και μέρος του συστήματός σας. Παρακαλώ εγκαταστήστε τους πρώτα."
#: csvimportdlg.cpp:61
@@ -1212,45 +1212,45 @@ msgstr "Κάθετο Κενό"
msgid "Horizontal Gap"
msgstr "Οριζόντιο Κενό"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
#, fuzzy
msgid "&Position && Size"
msgstr "Θέση: "
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
#, fuzzy
msgid "&Border"
msgstr "&Σειρά"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
#, fuzzy
msgid "&Fill Color"
msgstr "Χρώμα γεμίσματος:"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr ""
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
#, fuzzy
msgid "&Rotation"
msgstr "Περιστροφή"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
#, fuzzy
msgid "&Text"
msgstr "Νέο Κείμενο"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
#, fuzzy
msgid "&Image"
msgstr "...ως &Εικόνας"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr ""
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
#, fuzzy
msgid "Property changed"
msgstr "Διαχειριστής Έργου"
@@ -1387,7 +1387,7 @@ msgid ""
"IMAGE and BARCODE."
msgstr ""
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Στατικό"
@@ -1528,31 +1528,31 @@ msgstr ""
msgid "&Properties"
msgstr "&Ιδιότητες"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Περιγραφή Ταμπέλας"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Παρακαλώ εισάγετε μια περιγραφή:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Μέγεθος: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Προσχέδιο Ταμπέλας: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Ορθογραφικός Έλεγχος"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "Το αρχείο %1 δεν υπάρχει."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>Το έγγραφο έχει αλλάξει.<br><br>Θέλετε να το αποθηκεύσετε?</qt>"
@@ -1633,80 +1633,80 @@ msgid "KBarcode is a barcode and label printing application for TDE."
msgstr ""
"Το KBarcode είναι μια εφαρμογή εκτύπωσης barcodes και ταμπελών για το TDE."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Προγραμματιστής"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Διαχειριστής Έργου"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "Έγραψε το GNU Barcode πάνω στο οποίο βασίζεται το kbarcode."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr ""
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Ιταλική μετάφραση"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Φινλανδική και Σουηδική μετάφραση, δημιουργία του εικονιδίου Kbarcode"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Ισπανική μετάφραση"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Ούγγρικη μετάφραση"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Εικονίδιο κλεμμένο από την εξαιρετική εφαρμογή qtella."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "Έγραψε το RichText KPart"
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Γαλλική μετάφραση"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "Βοήθεια με τον ZPL και IPL κώδικα"
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr ""
-#: main.cpp:110
+#: main.cpp:108
#, fuzzy
msgid "Made the Netherlands translation"
msgstr "Ιταλική μετάφραση"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr ""
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr ""
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr ""
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2617,7 +2617,7 @@ msgstr ""
msgid "ERROR: Empty SQL Query"
msgstr ""
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/po/es.po b/translations/messages/es.po
index 560ea06..39c445d 100644
--- a/po/es.po
+++ b/translations/messages/es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kbabel-es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: 2003-11-08 16:04+0100\n"
"Last-Translator: Miguel Revilla Rodríguez <yo@miguelrevilla.com>\n"
"Language-Team: Español <kde-es@kybs.de>\n"
@@ -21,13 +21,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Miguel Revilla Rodríguez"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -715,12 +715,12 @@ msgstr "El separador está vacío. Por favor, dele un valor."
msgid "<qt>The following items can not be added:"
msgstr "<qt>Lo siguientes elementos no se pueden añadir:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
#, fuzzy
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>No se puede ejecutar el comando:<br><b>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr ""
@@ -759,7 +759,7 @@ msgstr "Línea movida"
msgid "Raised or lowered an item"
msgstr ""
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
#, fuzzy
msgid "Protected Item"
msgstr "Elemento movido"
@@ -1006,9 +1006,9 @@ msgid ""
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"No hay controladores de Qt SQL instalados. KBarcode depende de estos "
+"No hay controladores de TQt SQL instalados. KBarcode depende de estos "
"controladores para el acceso a las diferentes bases de datos SQL. Los "
-"controladores son parte de la distribución del código fuente de Qt, y "
+"controladores son parte de la distribución del código fuente de TQt, y "
"deberían también formar parte de la distribución de su sistema operativo. "
"Por favor, instale los controladores antes de continuar."
@@ -1226,45 +1226,45 @@ msgstr "Hueco vertical"
msgid "Horizontal Gap"
msgstr "Hueco horizontal"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
#, fuzzy
msgid "&Position && Size"
msgstr "Posición: "
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
#, fuzzy
msgid "&Border"
msgstr "&Orden"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
#, fuzzy
msgid "&Fill Color"
msgstr "Color de relleno:"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "Código de &barras"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
#, fuzzy
msgid "&Rotation"
msgstr "Rotación:"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
#, fuzzy
msgid "&Text"
msgstr "Texto:"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
#, fuzzy
msgid "&Image"
msgstr "...como &imagen"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr ""
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
#, fuzzy
msgid "Property changed"
msgstr "Administrador del proyecto"
@@ -1401,7 +1401,7 @@ msgid ""
"IMAGE and BARCODE."
msgstr ""
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Estático"
@@ -1542,31 +1542,31 @@ msgstr ""
msgid "&Properties"
msgstr "&Propiedades"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Descripción de la etiqueta"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Por favor, introduzca una descripción:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Tamaño: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Plantilla de la etiqueta: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Revisar ortografía"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "El archivo %1 no existe."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>El documento ha sido modificado.<br><br>¿Desea guardarlo?</qt>"
@@ -1648,80 +1648,80 @@ msgstr ""
"KBarcode es una aplicación para la creación e impresión de códigos de barras "
"para TDE."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Programador"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Administrador del proyecto"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "Escribió GNU Barcode, en el que se basa kbarcode."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr ""
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Traducción italiana"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Traducciones finlandesa y sueca, creador del icono de KBarcode"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Traducción española"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Traducción húngara"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Icono de pestaña robado de su excelente aplicación qtella."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "Escribió la KPart de RichText"
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Traducción francesa"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "Ayuda con código ZPL y IPL"
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr ""
-#: main.cpp:110
+#: main.cpp:108
#, fuzzy
msgid "Made the Netherlands translation"
msgstr "Traducción italiana"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr ""
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr ""
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr ""
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2633,7 +2633,7 @@ msgstr ""
msgid "ERROR: Empty SQL Query"
msgstr ""
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/po/fi.po b/translations/messages/fi.po
index d2284ed..0cc4900 100644
--- a/po/fi.po
+++ b/translations/messages/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Anton Vaaranmaa <antonv@postikaista.net>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Anton Vaaranmaa"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -714,12 +714,12 @@ msgstr "Erotin on tyhjä. Anna sille jokin arvo."
msgid "<qt>The following items can not be added:"
msgstr "<qt>Seuraavia tietueita ei voitu lisätä:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
#, fuzzy
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>Komentoa ei voitu suorittaa:<br><b>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr ""
@@ -760,7 +760,7 @@ msgid "Raised or lowered an item"
msgstr ""
# fuzzyish
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
#, fuzzy
msgid "Protected Item"
msgstr "Siirretty objekti"
@@ -1009,9 +1009,9 @@ msgid ""
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Järjestelmässä ei ole QT SQL-ajuria asennettuna. KBarcode tarvitsee "
+"Järjestelmässä ei ole TQt SQL-ajuria asennettuna. KBarcode tarvitsee "
"sellaisen kyetäkseen muodostamaan SQL-tietokantayhteyksiä. Ajureita "
-"toimitetaan osana QT-kirjaston lähdekoodia. Sopiva ajuri pitäisi löytyä myös "
+"toimitetaan osana TQt-kirjaston lähdekoodia. Sopiva ajuri pitäisi löytyä myös "
"sinun jakelustasi. Ole hyvä ja asenna jokin ajuri."
#: csvimportdlg.cpp:61
@@ -1227,45 +1227,45 @@ msgstr "Reunus pystysuunnassa"
msgid "Horizontal Gap"
msgstr "Reunus vaakasuunnassa"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
#, fuzzy
msgid "&Position && Size"
msgstr "Sijainti: "
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
#, fuzzy
msgid "&Border"
msgstr "&Järjestä"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
#, fuzzy
msgid "&Fill Color"
msgstr "Täytön väri:"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "&Viivakoodi"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
#, fuzzy
msgid "&Rotation"
msgstr "Kierto:"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
#, fuzzy
msgid "&Text"
msgstr "Teksti:"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
#, fuzzy
msgid "&Image"
msgstr "...&Kuvana"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr ""
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
#, fuzzy
msgid "Property changed"
msgstr "Projektipäällikkö"
@@ -1402,7 +1402,7 @@ msgid ""
"IMAGE and BARCODE."
msgstr ""
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Staattinen"
@@ -1543,31 +1543,31 @@ msgstr ""
msgid "&Properties"
msgstr "&Ominaisuudet"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Etiketin kuvaus"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Määrittele kuvaus:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Koko: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Etiketin mallipohja: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Oikoluku"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "Tiedostoa %1 ei ole olemassa."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>Asiakirjaa on muokattu.<br><br>Haluatko tallentaa sen?</qt>"
@@ -1648,80 +1648,80 @@ msgstr "Viivakoodi"
msgid "KBarcode is a barcode and label printing application for TDE."
msgstr "KBarcode on viivakoodien ja etikettien tulostusohjelma TDE:lle."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Ohjelmoija"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Projektipäällikkö"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "GNU Barcoden, johon KBarcode perustuu, tekijä"
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr ""
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Käännös italian kielelle"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Käännös suomen- ja ruotsin kielille. Kuvakkeiden tekijä."
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Käännös espanjan kielelle"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Käännös unkarin kielelle"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Tab icon -koodi varastettu hänen qtella-ohjelmastaan."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "RichText KPart:n tekijä"
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Käännös ranskan kielelle"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "Avusti ZLP ja IPL-koodien kanssa"
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr ""
-#: main.cpp:110
+#: main.cpp:108
#, fuzzy
msgid "Made the Netherlands translation"
msgstr "Käännös italian kielelle"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr ""
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr ""
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr ""
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2633,7 +2633,7 @@ msgstr ""
msgid "ERROR: Empty SQL Query"
msgstr ""
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/po/fr.po b/translations/messages/fr.po
index 42201ce..7c2ab0a 100644
--- a/po/fr.po
+++ b/translations/messages/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: 2006-06-30 20:01+0200\n"
"Last-Translator: Raphaël Pinson <raphink@ubuntu.com>\n"
"Language-Team: Français <kde-francophone@kde.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Yann Bouan, Raphaël Pinson"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -526,7 +526,7 @@ msgstr ""
"<qt>KBarcode peut placer des numéros de série sur les étiquettes. Si vous "
"n'avez pas besoin de cette fonctionalité, vous pouvez passer cette étape. "
"<br>Le début du numéro de série est une valeur contenant au moins un "
-"chiffre. Ce chiffre est imcrémenté pour chaque étiquette imprimée</qt"
+"chiffre. Ce chiffre est imcrémenté pour chaque étiquette imprimée</qt>"
#: batchwizard.cpp:216 previewdialog.cpp:104
msgid "Serial start:"
@@ -735,12 +735,12 @@ msgstr "Séparateur est vide veuillez lui donner une valeur."
msgid "<qt>The following items can not be added:"
msgstr "<qt>Les objets suivants ne peuvent être ajouté"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
#, fuzzy
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>Impossible d'executer la commande:<br><b>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr ""
@@ -783,7 +783,7 @@ msgstr "Elément protégé"
msgid "Raised or lowered an item"
msgstr ""
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
msgid "Protected Item"
msgstr "Elément protégé"
@@ -1049,9 +1049,9 @@ msgid ""
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Il n'y a pas de pilote QT SQL installé. KBarcode a besoin de ces pilotes "
+"Il n'y a pas de pilote TQt SQL installé. KBarcode a besoin de ces pilotes "
"pour accéder aux différentes bases SQL. Ces pilotes font partie des paquets "
-"sources de QT et devraient être présents dans votre distribution. Veuillez "
+"sources de TQt et devraient être présents dans votre distribution. Veuillez "
"les installer."
#: csvimportdlg.cpp:61
@@ -1269,39 +1269,39 @@ msgstr "Espacement vertical"
msgid "Horizontal Gap"
msgstr "Espacement horizontal"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
msgid "&Position && Size"
msgstr "&Position et Taille"
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
msgid "&Border"
msgstr "&Bordure"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
msgid "&Fill Color"
msgstr "Couleur de remplissage :"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "Code-&barre"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
msgid "&Rotation"
msgstr "&Rotation :"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
msgid "&Text"
msgstr "&Texte : "
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
msgid "&Image"
msgstr "&Image"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr "&Visibilité"
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
msgid "Property changed"
msgstr "Propriété modifiée"
@@ -1440,7 +1440,7 @@ msgstr ""
"%1 n'est pas une un format d'export valid pour l'option --output. Les "
"valeurs valides sont POSTSCRIPT, IMAGE et BARCODE."
-#: label.cpp:188
+#: label.cpp:197
#, fuzzy
msgid "Static"
msgstr "Statique"
@@ -1584,31 +1584,31 @@ msgstr "&Protéger la position et la taille"
msgid "&Properties"
msgstr "&Propriétés"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Description de l'étiquette"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Entrez une description :"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Taille : "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Modèle d'étiquette: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Vérification orthographique"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "Le fichier %1 n'existe pas."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>Le document a été modifié<br><br> Voulez-vous l'enregistrer ?</qt>"
@@ -1692,81 +1692,81 @@ msgstr ""
"KBarcode est une application d'impression de code-barres et d'étiquettes "
"pour TDE. "
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Programmeur"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Chef de Projet"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "A écrit GNU Barcode qui sert de base pour KBarcode."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr ""
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Traducteur Italien"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Traducteur Finlandais et Suédois, créateur de l'icone de KBarcode"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Traducteur Espagnol"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Traducteur Hongrois"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Code de TabIcon volé de son excellent programme qtella."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "A écrit le Kpart pour RichText."
-#: main.cpp:107
+#: main.cpp:105
#, fuzzy
msgid "French Translation"
msgstr "Traducteur Espagnol"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr ""
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr ""
-#: main.cpp:110
+#: main.cpp:108
#, fuzzy
msgid "Made the Netherlands translation"
msgstr "Traducteur Italien"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr ""
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr ""
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr ""
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2685,7 +2685,7 @@ msgstr ""
msgid "ERROR: Empty SQL Query"
msgstr ""
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/po/hu.po b/translations/messages/hu.po
index 64b67f1..7c80beb 100644
--- a/po/hu.po
+++ b/translations/messages/hu.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: 2003-12-02 22:09+0100\n"
"Last-Translator: Sandor Jager <jager@puskas.hu>\n"
"Language-Team: Hungarian <hu@li.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Sandor Jager"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -715,12 +715,12 @@ msgstr "Üres szeparátor! Kérlek adj meg egy értéket!"
msgid "<qt>The following items can not be added:"
msgstr "<qt>A következő elemeket nem lehet hozzáadni:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
#, fuzzy
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>Nem hajtható végre a parancs:<br><b>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr ""
@@ -759,7 +759,7 @@ msgstr "Vonal áthelyezve"
msgid "Raised or lowered an item"
msgstr ""
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
#, fuzzy
msgid "Protected Item"
msgstr "Objektum áthelyezve"
@@ -1003,8 +1003,8 @@ msgid ""
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Nincsen Qt SQL driver telepítve. A KBarcodenak a különböző adatbázisok "
-"eléréséhez van erre szüksége. Ezek a driverek részei a Qt forráscsomagoknak, "
+"Nincsen TQt SQL driver telepítve. A KBarcodenak a különböző adatbázisok "
+"eléréséhez van erre szüksége. Ezek a driverek részei a TQt forráscsomagoknak, "
"valamint szerepelniük kell a te disztribúciódban is. Kérlek először ezeket "
"telepítsd fel."
@@ -1221,45 +1221,45 @@ msgstr "Függőleges köz:"
msgid "Horizontal Gap"
msgstr "Vízszintes köz:"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
#, fuzzy
msgid "&Position && Size"
msgstr "Pozíció: "
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
#, fuzzy
msgid "&Border"
msgstr "&Sorrend"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
#, fuzzy
msgid "&Fill Color"
msgstr "Kitöltési szín:"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "&Vonalkód"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
#, fuzzy
msgid "&Rotation"
msgstr "Elforgatás:"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
#, fuzzy
msgid "&Text"
msgstr "Szöveg:"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
#, fuzzy
msgid "&Image"
msgstr "... &képként"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr ""
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
#, fuzzy
msgid "Property changed"
msgstr "Projektmenedzser"
@@ -1397,7 +1397,7 @@ msgid ""
"IMAGE and BARCODE."
msgstr ""
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Állandó"
@@ -1538,31 +1538,31 @@ msgstr ""
msgid "&Properties"
msgstr "&Tulajdonságok"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Címke leírása"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Kérlek adj meg leírást:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Méret: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Címke sablon: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Helyesírásellenőrzés"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "A %1 fájl nem létezik."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>A dokumentum megváltozott.<br><br>Kívánod elmenteni ?</qt>"
@@ -1642,80 +1642,80 @@ msgstr "Vonalkód"
msgid "KBarcode is a barcode and label printing application for TDE."
msgstr "A KBarcode egy vonalkód- és címkenyomtató alkalmazás TDE alá."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Programozó"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Projektmenedzser"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "A GNU Barcode készítője, melyen a kbarcode is alapul."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr ""
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Olasz fordítás"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Finn és svéd fordítás és a KBarcode ikon alkotója"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Spanyol fordítás"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Magyar fordítás"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Kódrészletek a qtella nevű remek programjából."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "Ő írta a RichText KPart részt."
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Francia fordítás"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "Segítség a ZPL és IPL kódokhoz"
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr ""
-#: main.cpp:110
+#: main.cpp:108
#, fuzzy
msgid "Made the Netherlands translation"
msgstr "Olasz fordítás"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr ""
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr ""
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr ""
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
msgid "ERROR: Empty SQL Query"
msgstr ""
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/po/it.po b/translations/messages/it.po
index b475edb..34a0ee9 100644
--- a/po/it.po
+++ b/translations/messages/it.po
@@ -4,14 +4,14 @@
# Copyright (C) 2003 Free Software Foundation, Inc.
# Daniele Medri <madrid@linuxmeeting.net>, 2003.
# Dominik Seichter <domseichter@web.de>, 2003.
-#
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2020, 2021.
msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
-"PO-Revision-Date: 2019-05-31 13:15+0000\n"
-"Last-Translator: stefano <ifx@lazytux.it>\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
+"PO-Revision-Date: 2021-08-22 07:14+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kbarcode/it/>\n"
"Language: it\n"
@@ -19,15 +19,15 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.6.1\n"
+"X-Generator: Weblate 4.7.2\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Daniele Medri"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -240,7 +240,7 @@ msgstr "Livello della correzione di errore:"
#: barcodedialogs.cpp:310
msgid "Data Matrix symbol sizes (rows x cols):"
-msgstr "Dimensione della matrice dei dati per i simboli (righe x colonne)"
+msgstr "Dimensione della matrice dei dati per i simboli (righe x colonne):"
#: barcodedialogs.cpp:314
msgid "Automatic calculation"
@@ -308,7 +308,7 @@ msgstr "%dispositivo:"
#: barcodeprinterdlg.cpp:58
msgid "TEC Printer (TEC)"
-msgstr "stampante TEC (TEC)"
+msgstr "Stampante TEC (TEC)"
#: barcodeprinterdlg.cpp:59
msgid "Zebra Printer (ZPL)"
@@ -418,7 +418,7 @@ msgstr "Gruppo : "
#: batchprinter.cpp:161 batchprinter.cpp:162 batchprinter.cpp:163
#: batchprinter.cpp:164
msgid "Article No. : "
-msgstr "Articolo N. : "
+msgstr "Articolo N. : "
#: batchprinter.cpp:273
msgid "Creating Images..."
@@ -680,11 +680,11 @@ msgstr "Il separatore è vuoto. Per piacere imposta il valore."
msgid "<qt>The following items can not be added:"
msgstr "<qt>Il seguente elemento non può essere aggiunto:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>Impossibile eseguire la query sql:<br>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr "non posso aprire il file: %1"
@@ -721,7 +721,7 @@ msgstr "elemento spostato"
msgid "Raised or lowered an item"
msgstr "alza o abbassa un elemento"
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
msgid "Protected Item"
msgstr "elemento protetto"
@@ -1121,7 +1121,7 @@ msgstr "Numero orizzontale:"
#: definitiondialog.cpp:127
msgid "Number Vertical:"
-msgstr "Numero verticale: "
+msgstr "Numero verticale:"
#: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
#: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
@@ -1165,45 +1165,45 @@ msgstr "Rientro sinistro"
#: definitiondialog.cpp:411
msgid "Vertical Gap"
-msgstr "Rientro verticale:"
+msgstr "Margine verticale"
#: definitiondialog.cpp:412
msgid "Horizontal Gap"
-msgstr "Rientro orizzontale:"
+msgstr "Margine orizzontale"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
msgid "&Position && Size"
msgstr "&Posizione && grandezza"
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
msgid "&Border"
msgstr "&bordo"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
msgid "&Fill Color"
msgstr "&Colore riempimento"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "&Barcode"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
msgid "&Rotation"
msgstr "&Rotazione"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
msgid "&Text"
msgstr "&Testo"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
msgid "&Image"
msgstr "&Immagine"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr "&visibilita"
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
msgid "Property changed"
msgstr "proprieta cambiata"
@@ -1229,7 +1229,7 @@ msgstr "Guida sui codici a &barre..."
#: dsmainwindow.cpp:96
msgid "&Donate..."
-msgstr "&Donate..."
+msgstr "&Dona..."
#: dsmainwindow.cpp:98
msgid "&System Check..."
@@ -1339,7 +1339,7 @@ msgstr ""
"%1 non è un formato valido per --output. valori validi sono POSTSCRIPT, "
"IMAGE and BARCODE."
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Statico"
@@ -1479,31 +1479,31 @@ msgstr "&proteggi posizione e misura"
msgid "&Properties"
msgstr "&Proprietà"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Descrizione etichetta"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Per piascere, inserisci una descrizione:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Dimensione: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Modello di etichetta: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Controllo ortografico"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "Il file %1 non esiste."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>Il documento è stato modificato.<br><br>Desideri salvarlo?</qt>"
@@ -1564,7 +1564,7 @@ msgstr ""
#: main.cpp:47
msgid "Print <value> labels without any data"
-msgstr "stampa <valore> etichetta senza alcun dato"
+msgstr "Stampa <valore> etichetta senza alcun dato"
#: main.cpp:48
msgid "Import variable data from a specified sql query"
@@ -1583,81 +1583,81 @@ msgid "KBarcode is a barcode and label printing application for TDE."
msgstr ""
"KBarcode è un'applicazione per creare etichette e codici a barre per TDE."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Sviluppatore"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Gestione progetto"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "Sviluppo di GNU Barcode sul quale si basa kbarcode."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
-msgstr ""
+msgstr "Autore di Barcode Writer in Pure Postscript"
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Traduzione italiana"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Traduzione finlandese e svedese, creata l'icona di KBarcode"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Traduzione in spagnolo"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Traduzione ungherese"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Codice prelevato dalla sua eccellente applicazione qtella."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "Sviluppo del RichText KPart"
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Traduzione in francese"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "Aiuto con il codice ZPL e IPL"
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
-msgstr ""
+msgstr "Ha scritto molte patch per migliorare KBarcode"
-#: main.cpp:110
+#: main.cpp:108
msgid "Made the Netherlands translation"
-msgstr ""
+msgstr "Traduzione in Olandese"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
-msgstr ""
+msgstr "Aggiunti molti campi dati utili a kbarcode"
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
-msgstr ""
+msgstr "Aggiunto il supporto per la stampante di codici a barre TEC"
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
-msgstr ""
+msgstr "Aggiunto il supporto per la stampante di codici a barre EPCL"
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
-msgstr ""
+msgstr "Ha risolvo vari bug."
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
-msgstr ""
+msgstr "Manutentore (progetto TDE)"
#: measurements.cpp:51
msgid "mm"
@@ -1668,9 +1668,8 @@ msgid "in"
msgstr "in"
#: mimesources.cpp:33
-#, fuzzy
msgid "Pasted Object"
-msgstr "&Elimina oggetto"
+msgstr "Oggetto incollato"
#: multilineeditdlg.cpp:95
msgid "&Bold"
@@ -1753,38 +1752,32 @@ msgstr ""
"Larghezza: "
#: newlabel.cpp:169
-#, fuzzy
msgid "%1<br>Height: "
-msgstr "mm<br> Altezza: "
+msgstr "%1<br>Altezza: "
#: newlabel.cpp:170
-#, fuzzy
msgid "%2<br>Horizontal Gap: "
-msgstr "mm<br> Orizzontale: "
+msgstr "%2<br>Margine orizzontale: "
#: newlabel.cpp:171
-#, fuzzy
msgid "%3<br>Vertical Gap: "
-msgstr "mm<br> Verticale: "
+msgstr "%3<br>Margine verticale: "
#: newlabel.cpp:172
-#, fuzzy
msgid "%4<br>Top Gap: "
-msgstr "mm<br> Alto: "
+msgstr "%3<br>Margine verticale: "
#: newlabel.cpp:173
-#, fuzzy
msgid "%5<br>Left Gap: "
-msgstr "mm<br> Sinistra: "
+msgstr "%5<br>Margine sinistro: "
#: newlabel.cpp:192
msgid "No label selected."
msgstr "nessuna etichetta selezionata."
#: previewdialog.cpp:89
-#, fuzzy
msgid "Select &Address"
-msgstr "Inserisci &indirizzo..."
+msgstr "Seleziona &Indirizzo"
#: previewdialog.cpp:95
msgid "Customer Name and No.:"
@@ -1803,9 +1796,8 @@ msgid "Index:"
msgstr "Indice:"
#: previewdialog.cpp:108
-#, fuzzy
msgid "Addressbook entry:"
-msgstr "Ru&brica"
+msgstr "Voci della ru&brica:"
#: printersettings.cpp:39
msgid "ISO A3"
@@ -1948,9 +1940,8 @@ msgid "Line Style:"
msgstr "Stile linea:"
#: propertywidget.cpp:145 propertywidget.cpp:485
-#, fuzzy
msgid "90"
-msgstr "0"
+msgstr "90"
#: propertywidget.cpp:146 propertywidget.cpp:486
msgid "180"
@@ -1969,57 +1960,48 @@ msgid "&Protect item from being moved or resized"
msgstr "&proteggi elemento da spostamento e ridimensionamento"
#: propertywidget.cpp:357
-#, fuzzy
msgid "&Top:"
-msgstr "&In alto"
+msgstr "&In alto:"
#: propertywidget.cpp:358
-#, fuzzy
msgid "&Left:"
-msgstr "Sinistra:"
+msgstr "&Sinistra:"
#: propertywidget.cpp:359
-#, fuzzy
msgid "&Height:"
-msgstr "mm<br> Altezza: "
+msgstr "&Altezza:"
#: propertywidget.cpp:360
-#, fuzzy
msgid "&Width:"
-msgstr "Larghezza linea:"
+msgstr "&Larghezza:"
#: propertywidget.cpp:471
-#, fuzzy
msgid "&Load image from path"
-msgstr "Formato immagine non supportato"
+msgstr "Carica immagine dal &percorso"
#: propertywidget.cpp:475
msgid "&Read image path from expression"
msgstr "&leggi percorso immagine da espressione"
#: propertywidget.cpp:489
-#, fuzzy
msgid "&Size"
-msgstr "Dimensione: "
+msgstr "&Dimensione"
#: propertywidget.cpp:491
msgid "&None"
msgstr "&nessuno"
#: propertywidget.cpp:493
-#, fuzzy
msgid "S&cale"
-msgstr "Riscala:"
+msgstr "Ris&cala"
#: propertywidget.cpp:495
-#, fuzzy
msgid "Mirror &Horizontaly"
-msgstr "Centra &orizzontalmente"
+msgstr "Inverti &orizzontalmente"
#: propertywidget.cpp:496
-#, fuzzy
msgid "Mirror &Vertically"
-msgstr "Centra &verticalmente"
+msgstr "Inverti &verticalmente"
#: propertywidget.cpp:522
#, c-format
@@ -2055,19 +2037,16 @@ msgid "Add Barcode_basic"
msgstr "Aggiungi Barcode_basic"
#: smalldialogs.cpp:61
-#, fuzzy
msgid "Add Items"
-msgstr "Aggiungi elemento"
+msgstr "Aggiungi elementi"
#: smalldialogs.cpp:68
-#, fuzzy
msgid "Edit Item"
-msgstr "Aggiungi elemento"
+msgstr "Modifica elemento"
#: smalldialogs.cpp:92
-#, fuzzy
msgid "Article:"
-msgstr "Articolo N."
+msgstr "Articolo:"
#: sqltables.cpp:123
msgid "<qt>Unable to open database: "
@@ -2090,14 +2069,12 @@ msgid "<br>You can continue if the database exists already.</qt>"
msgstr "<br>Puoi continuare se il database esiste già.</qt>"
#: sqltables.cpp:183
-#, fuzzy
msgid "<qt>Can't connect to database to create table."
-msgstr "Impossibile connettersi al database."
+msgstr "<qt>Impossibile connettersi al database per creare una tabella."
#: sqltables.cpp:183
-#, fuzzy
msgid "<br>You can continue if the table exists already.</qt>"
-msgstr "<br>Puoi continuare se il database esiste già.</qt>"
+msgstr "<br>Puoi continuare se la tabella esiste già.</qt>"
#: sqltables.cpp:195
msgid ""
@@ -2127,9 +2104,8 @@ msgid ""
"Data file for import not found. Continuing without importing data. Please "
"check your KBarcode installation."
msgstr ""
-"file dati da importare non trovato. continuo senza importare dati. prego "
-"controlla la\n"
-"tua installazione di KBarcode."
+"File dati per l'importazione non trovato. Continuo senza importare i dati. "
+"Controlla la tua installazione di KBarcode."
#: sqltables.cpp:326
msgid "SQL import progress:"
@@ -2197,21 +2173,19 @@ msgstr ""
#: textlineedit.cpp:130
msgid "&Mag. Vert.:"
-msgstr ""
+msgstr "Ingrandimento ver&ticale:"
#: textlineedit.cpp:132
msgid "&Mag. Hor.:"
-msgstr ""
+msgstr "Ingrandi&mento orizzontale:"
#: tokendialog.cpp:65 tokendialog.cpp:93 tokendialog.cpp:109
-#, fuzzy
msgid "What do you want to insert?"
-msgstr "Quante etichette desideri stampare?"
+msgstr "Cosa vuoi inserire?"
#: tokendialog.cpp:67
-#, fuzzy
msgid "Insert a &fixed data field"
-msgstr "Inserisci campo &database"
+msgstr "Inserisci un campo dati &fisso"
#: tokendialog.cpp:68
msgid "Insert a &custom SQL query, variable or JavaScript function"
@@ -2239,27 +2213,24 @@ msgid "Insert printing &informations"
msgstr "inserisci info stampa"
#: tokendialog.cpp:96
-#, fuzzy
msgid "&Insert a database field"
-msgstr "Inserisci campo &database"
+msgstr "&Inserisci campo database"
#: tokendialog.cpp:97
msgid "Insert a &date/time function"
msgstr "inserisci una funzione data/ora"
#: tokendialog.cpp:98
-#, fuzzy
msgid "Insert an &addressbook field"
-msgstr "Inserisci &indirizzo..."
+msgstr "Inserisci un campo dalla &rubrica"
#: tokendialog.cpp:111
msgid "Insert a custom &variable"
msgstr "inserisci una variabile &personalizzata"
#: tokendialog.cpp:112
-#, fuzzy
msgid "Insert a &SQL query"
-msgstr "Inserisci &linea"
+msgstr "Inserisci una query &SQL"
#: tokendialog.cpp:113
msgid "Insert a &JavaScript function"
@@ -2278,9 +2249,8 @@ msgid "Token"
msgstr "token"
#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
msgid "Description"
-msgstr "Descrizione etichetta"
+msgstr "Descrizione"
#: tokendialog.cpp:146
msgid "&Custom Expression to be inserted in the token."
@@ -2292,289 +2262,284 @@ msgid ""
"the case of the sqlquery token, the sure has to enter a sql query in this "
"text field.</qt>"
msgstr ""
+"<qt>Alcuni token, come ad esempio il token sqlquery, necessitano di "
+"argomenti. Nel caso del token sqlquery, sicuramente devi inserire una query "
+"sql in questo campo di testo.</qt>"
#: tokendialog.cpp:191
-#, fuzzy
msgid "&Create a new custom variable"
-msgstr "&Crea una nuova etichetta all'avvio"
+msgstr "&Crea una nuova variabile personalizzata"
#: tokendialog.cpp:194
msgid "&Insert an existing custom variable"
-msgstr ""
+msgstr "&Inserisci una variabile personalizzata esistente"
#: tokendialog.cpp:219
msgid ""
"<qt><b>No SQL connection found!</b><br>You can build a query, but you will "
"not be able to execute or test it right now.<br></qt>"
msgstr ""
+"<qt><b>Nessuna connessione SQL trovata!</b><br>Puoi creare una query, ma non "
+"potrai eseguirla o testarla in questo momento.<br></qt>"
#: tokendialog.cpp:224
msgid "&SQL Query:"
-msgstr ""
+msgstr "&Interrogazione (query) SQL:"
#: tokendialog.cpp:226
msgid "&Test"
-msgstr ""
+msgstr "&Test"
#: tokendialog.cpp:231
msgid "Query test results:"
-msgstr ""
+msgstr "Risultati del test dell'interrogazione (query):"
#: tokendialog.cpp:246
msgid "/* Place your JavaScript code into this text field. */\n"
-msgstr ""
+msgstr "/* Inserisci il tuo codice JavaScript in questo campo di testo. */\n"
#: tokendialog.cpp:339
msgid "All"
-msgstr ""
+msgstr "Tutto"
#: tokendialog.cpp:352 tokendialog.cpp:420
-#, fuzzy
msgid "Variable defined by the user for this label."
-msgstr "Campo del database da utilizzare per questa colonna:"
+msgstr "Variabile definita dall'utente per questa etichetta."
#: tokendialog.cpp:417 tokenprovider.cpp:209
-#, fuzzy
msgid "Custom Values"
-msgstr "Nome cliente:"
+msgstr "Valori personalizzati"
#: tokenprovider.cpp:210
msgid "Date & Time"
-msgstr ""
+msgstr "Date e ora"
#: tokenprovider.cpp:211
-#, fuzzy
msgid "Addressbook"
-msgstr "Ru&brica"
+msgstr "Rubrica"
#: tokenprovider.cpp:216
-#, fuzzy
msgid "Article description from barcode_basic"
-msgstr "Descrizione articolo"
+msgstr "Descrizione articolo da barcode_basic"
#: tokenprovider.cpp:217
-#, fuzzy
msgid "Article number from barcode_basic"
-msgstr "Importa barcode_basic"
+msgstr "Numero articolo da barcode_basic"
#: tokenprovider.cpp:224
msgid "customer number of the current customer"
-msgstr ""
+msgstr "numero cliente del cliente attuale"
#: tokenprovider.cpp:225
msgid "name of the current customer"
-msgstr ""
+msgstr "nome del cliente attuale"
#: tokenprovider.cpp:226
-#, fuzzy
msgid "Barcode number from barcode_basic"
-msgstr "Importa barcode_basic"
+msgstr "Numero del codice a barre da barcode_basic"
#: tokenprovider.cpp:228
msgid "group of the current article"
-msgstr ""
+msgstr "gruppo dell'articolo corrente"
#: tokenprovider.cpp:229
msgid "Barcode encoding type from barcode_basic"
-msgstr ""
+msgstr "Tipo di codifica del codice a barre da barcode_basic"
#: tokenprovider.cpp:230
msgid "User readable barcode encoding type from barcode_basic"
msgstr ""
+"Tipo di codifica del codice a barre leggibile dall'utente da barcode_basic"
#: tokenprovider.cpp:235
msgid "Path and filename of this file"
-msgstr ""
+msgstr "Percorso e nome di questo file"
#: tokenprovider.cpp:236
msgid "number of labels currently printed during this printout"
-msgstr ""
+msgstr "numero di etichette da stampare durante questa stampa"
#: tokenprovider.cpp:237
msgid "current column on the page"
-msgstr ""
+msgstr "colonna attuale della pagina"
#: tokenprovider.cpp:238
msgid "current row on the page"
-msgstr ""
+msgstr "riga corrente nella pagina"
#: tokenprovider.cpp:239
-#, fuzzy
msgid "Current page"
-msgstr "Tabella attuale: <b>"
+msgstr "Pagina corrente"
#: tokenprovider.cpp:240
-#, fuzzy
msgid "Current resolution"
-msgstr "Risoluzione schermo"
+msgstr "Risoluzione corrente"
#: tokenprovider.cpp:241
msgid "Include a serial number on your labels."
-msgstr ""
+msgstr "Includi un numero di serie sulle etichette."
#: tokenprovider.cpp:247
msgid "Execute java script code"
-msgstr ""
+msgstr "Esegui codice java script"
#: tokenprovider.cpp:248
msgid "Insert the result of a custom sql query"
-msgstr ""
+msgstr "Inserisci il risultato di una query sql personalizzata"
#: tokenprovider.cpp:249
msgid "Insert a custom variable"
-msgstr ""
+msgstr "Inserisci una variabile personalizzata"
#: tokenprovider.cpp:254
msgid "Date formated as configured in the preferences"
-msgstr ""
+msgstr "Data formattata come configurata nelle preferenze"
#: tokenprovider.cpp:255
msgid "Short Weekday Name"
-msgstr ""
+msgstr "Nome del giorno della settimana breve"
#: tokenprovider.cpp:256
msgid "Full Weekday Name"
-msgstr ""
+msgstr "Nome completo del giorno della settimana"
#: tokenprovider.cpp:257
msgid "Short Month Name"
-msgstr ""
+msgstr "Nome del mese breve"
#: tokenprovider.cpp:258
msgid "Full Month Name"
-msgstr ""
+msgstr "Nome del mese completo"
#: tokenprovider.cpp:259
-#, fuzzy
msgid "Date-Time"
-msgstr "Data"
+msgstr "Data-Ora"
#: tokenprovider.cpp:260
-#, fuzzy
msgid "Century"
-msgstr "&Centra"
+msgstr "Secolo"
#: tokenprovider.cpp:261
msgid "Day Number (01-31)"
-msgstr ""
+msgstr "Numero del giorno (01-31)"
#: tokenprovider.cpp:262
msgid "Month-Day-year"
-msgstr ""
+msgstr "Mese-giorno-anno"
#: tokenprovider.cpp:263
msgid "Day Number ( 1-31)"
-msgstr ""
+msgstr "Numero del giorno ( 1-31)"
#: tokenprovider.cpp:264
msgid "Year-Month-day"
-msgstr ""
+msgstr "Anno-mese-giorno"
#: tokenprovider.cpp:265
msgid "Week Year (yy)"
-msgstr ""
+msgstr "Settimana Anno (aa)"
#: tokenprovider.cpp:266
msgid "Week Year (yyyy)"
-msgstr ""
+msgstr "Settimana Anno (aaaa)"
#: tokenprovider.cpp:267
msgid "Hour (01-24)"
-msgstr ""
+msgstr "Ora (01-24)"
#: tokenprovider.cpp:268
msgid "Hour (1-12)"
-msgstr ""
+msgstr "Ora (1-12)"
#: tokenprovider.cpp:269
msgid "Day of Year"
-msgstr ""
+msgstr "Giorno dell'anno"
#: tokenprovider.cpp:270
msgid "Month Number (01-12)"
-msgstr ""
+msgstr "Numero del mese (01-12)"
#: tokenprovider.cpp:271
msgid "Minute (00-59)"
-msgstr ""
+msgstr "Minuto (00-59)"
#: tokenprovider.cpp:272
msgid "a.m./p.m."
-msgstr ""
+msgstr "a.m./p.m."
#: tokenprovider.cpp:273
msgid "Time (h:m:s am/pm)"
-msgstr ""
+msgstr "Ora (h:m:s am/pm)"
#: tokenprovider.cpp:274
msgid "Time (HH:MM)"
-msgstr ""
+msgstr "Ora (HH:MM)"
#: tokenprovider.cpp:275
msgid "Seconds (00-59)"
-msgstr ""
+msgstr "Secondi (00-59)"
#: tokenprovider.cpp:276
msgid "Time (HH:MM:SS)"
-msgstr ""
+msgstr "Ora (HH:MM:SS)"
#: tokenprovider.cpp:277
msgid "Weekday (1=Monday...)"
-msgstr ""
+msgstr "Giorno della settimana (1=lunedì...)"
#: tokenprovider.cpp:278 tokenprovider.cpp:281
msgid "Week Number (00-53)"
-msgstr ""
+msgstr "Numero della settimana (00-53)"
#: tokenprovider.cpp:279
msgid "Week Number (01-53)"
-msgstr ""
+msgstr "Numero della settimana (01-53)"
#: tokenprovider.cpp:280
msgid "Weekday (0=Sunday...)"
-msgstr ""
+msgstr "Giorno della settimana (0=domenica...)"
#: tokenprovider.cpp:282
msgid "Local Date"
-msgstr ""
+msgstr "Data locale"
#: tokenprovider.cpp:283
msgid "Local Time"
-msgstr ""
+msgstr "Ora locale"
#: tokenprovider.cpp:284
msgid "Year (00-99)"
-msgstr ""
+msgstr "Anno (00-99)"
#: tokenprovider.cpp:285
msgid "Year (YYYY)"
-msgstr ""
+msgstr "Anno (00-99)"
#: tokenprovider.cpp:286
msgid "Offset from UTC"
-msgstr ""
+msgstr "Scostamento da UTC"
#: tokenprovider.cpp:287
msgid "Timezone Name"
-msgstr ""
+msgstr "Nome fuso orario"
#: tokenprovider.cpp:292
msgid "Name"
-msgstr ""
+msgstr "Nome"
#: tokenprovider.cpp:296
msgid "Full E-Mail"
-msgstr ""
+msgstr "E-mail completa"
#: tokenprovider.cpp:319
msgid "Formatted Address"
-msgstr ""
+msgstr "Indirizzo formattato"
#: tokenprovider.cpp:825
msgid "ERROR: Empty SQL Query"
-msgstr ""
+msgstr "ERRORE: query SQL vuota"
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/po/kbarcode.pot b/translations/messages/kbarcode.pot
index bae7c5d..d750c5b 100644
--- a/po/kbarcode.pot
+++ b/translations/messages/kbarcode.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,13 +13,15 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
+#, ignore-inconsistent
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr ""
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
+#, ignore-inconsistent
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -660,11 +662,11 @@ msgstr ""
msgid "<qt>The following items can not be added:"
msgstr ""
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
msgid "<qt>Can't execute SQL query:<br>"
msgstr ""
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr ""
@@ -701,7 +703,7 @@ msgstr ""
msgid "Raised or lowered an item"
msgstr ""
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
msgid "Protected Item"
msgstr ""
@@ -1129,39 +1131,39 @@ msgstr ""
msgid "Horizontal Gap"
msgstr ""
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
msgid "&Position && Size"
msgstr ""
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
msgid "&Border"
msgstr ""
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
msgid "&Fill Color"
msgstr ""
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr ""
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
msgid "&Rotation"
msgstr ""
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
msgid "&Text"
msgstr ""
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
msgid "&Image"
msgstr ""
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr ""
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
msgid "Property changed"
msgstr ""
@@ -1287,7 +1289,7 @@ msgid ""
"IMAGE and BARCODE."
msgstr ""
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr ""
@@ -1297,8 +1299,8 @@ msgstr ""
#: labeleditor.cpp:385
msgid ""
-"<qt>The file <b>%1</b> cannot be loaded as the label definition is "
-"missing.</qt>"
+"<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
+"qt>"
msgstr ""
#: labeleditor.cpp:444
@@ -1425,31 +1427,31 @@ msgstr ""
msgid "&Properties"
msgstr ""
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr ""
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr ""
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr ""
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr ""
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr ""
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr ""
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr ""
@@ -1524,79 +1526,79 @@ msgstr ""
msgid "KBarcode is a barcode and label printing application for TDE."
msgstr ""
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr ""
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr ""
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr ""
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr ""
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr ""
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr ""
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr ""
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr ""
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr ""
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr ""
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr ""
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr ""
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr ""
-#: main.cpp:110
+#: main.cpp:108
msgid "Made the Netherlands translation"
msgstr ""
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr ""
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr ""
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr ""
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2461,8 +2463,8 @@ msgstr ""
msgid "ERROR: Empty SQL Query"
msgstr ""
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
-"<qt>This appears file appears to be created by an older version of "
-"KBarcode.<br>Please check if the used label definition is correct:<br><b>"
+"<qt>This appears file appears to be created by an older version of KBarcode."
+"<br>Please check if the used label definition is correct:<br><b>"
msgstr ""
diff --git a/po/nl.po b/translations/messages/nl.po
index b8a7ba8..e7c94bc 100644
--- a/po/nl.po
+++ b/translations/messages/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kbarcode-1.7.0_nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: 2004-01-10 20:36+0000\n"
"Last-Translator: Schoolmeesters <frank_schoolmeesters@yahoo.com>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.1\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Frank Schoolmeesters"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -707,12 +707,12 @@ msgstr "De Scheider is leeg. Geef a.u.b. een waarde"
msgid "<qt>The following items can not be added:"
msgstr "<qt>De volgende zaken kunnen niet toegevoegd worden:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
#, fuzzy
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>Kan commando niet uitvoeren:<br><b>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr ""
@@ -751,7 +751,7 @@ msgstr "Item toevoegen"
msgid "Raised or lowered an item"
msgstr ""
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
msgid "Protected Item"
msgstr ""
@@ -997,9 +997,9 @@ msgid ""
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Er zijn geen Qt SQL drivers geïnstalleerd. KBarcode heeft deze drivers nodig "
+"Er zijn geen TQt SQL drivers geïnstalleerd. KBarcode heeft deze drivers nodig "
"om de verschillende SQL databases te raadplegen. Deze drivers zijn onderdeel "
-"van de Qt bron distributie en moeten een onderdeel zijn van uw distributie. "
+"van de TQt bron distributie en moeten een onderdeel zijn van uw distributie. "
"Installeer deze eerst a.u.b."
#: csvimportdlg.cpp:61
@@ -1214,45 +1214,45 @@ msgstr "Verticale tussenruimte:"
msgid "Horizontal Gap"
msgstr "Horizontale tussenruimte:"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
#, fuzzy
msgid "&Position && Size"
msgstr "Positie: "
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
#, fuzzy
msgid "&Border"
msgstr "&Volgorde"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
#, fuzzy
msgid "&Fill Color"
msgstr "Opvulkleur:"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "&Barcode"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
#, fuzzy
msgid "&Rotation"
msgstr "Rotatie:"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
#, fuzzy
msgid "&Text"
msgstr "Nieuwe text"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
#, fuzzy
msgid "&Image"
msgstr "... als &Afbeelding"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr ""
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
#, fuzzy
msgid "Property changed"
msgstr "Project Manager"
@@ -1390,7 +1390,7 @@ msgid ""
"IMAGE and BARCODE."
msgstr ""
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Statisch"
@@ -1531,31 +1531,31 @@ msgstr ""
msgid "&Properties"
msgstr "&Eigenschappen"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Label beschrijving"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Geef a.u.b. een beschrijving:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Grootte: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Label sjabloon: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Spellingcontrole"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "Het bestand %1 bestaat niet."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>Het document is gewijzigd.<br><br>Wilt u het bewaren ?</qt>"
@@ -1635,80 +1635,80 @@ msgstr "Barcode"
msgid "KBarcode is a barcode and label printing application for TDE."
msgstr "KBarcode is een barcode and label afdruk toepassing voor TDE."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Programmeur"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Project Manager"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "Heeft GNU Barcode geschreven op welk kbarcode is gebaseerd."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr ""
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Italiaanse vertaling"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Finse en Zweedse vertaling, maken van het KBarcode icoon"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Spaanse vertaling"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Hongaarse vertaling"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Tab icoon gestolen van zijn uitstekende qtella applicatie"
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "Heeft RichText KPart geschreven"
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Franse vertaling"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "Hulp met ZPL en IPL code"
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr ""
-#: main.cpp:110
+#: main.cpp:108
#, fuzzy
msgid "Made the Netherlands translation"
msgstr "Italiaanse vertaling"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr ""
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr ""
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr ""
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2618,7 +2618,7 @@ msgstr ""
msgid "ERROR: Empty SQL Query"
msgstr ""
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/po/pl.po b/translations/messages/pl.po
index 9bd7cfd..cddfa44 100644
--- a/po/pl.po
+++ b/translations/messages/pl.po
@@ -4,40 +4,41 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
# Benedykt P. Barszcz <kb2qzv@localhost.localdomain>, 2004.
# Benedict P. Barszcz <kb2qzv@localhost.localdomain>, 2004.
-#
+# Marek W <coronzon88@gmail.com>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
-"PO-Revision-Date: 2004-02-11 14:34+0100\n"
-"Last-Translator: Benedict P. Barszcz <kb2qzv@localhost.localdomain>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
+"PO-Revision-Date: 2023-08-13 10:29+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kbarcode/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Benedykt P. Barszcz"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
msgstr "kb2qzv_@_poczta.wp.pl"
#: barcodecombo.cpp:121
-#, fuzzy
msgid "&Encoding Type:"
-msgstr "Rodzaj Kodowania"
+msgstr "Typ kodowania:"
#: barcodecombo.cpp:130
-#, fuzzy
msgid "&Value:"
msgstr "Wartość:"
@@ -50,29 +51,24 @@ msgid "&Advanced..."
msgstr "&Zaawansowane..."
#: barcodecombo.cpp:161 propertywidget.cpp:481
-#, fuzzy
msgid "&Insert Data Field..."
-msgstr "Wstaw pole bazy &danych"
+msgstr "Wstaw pole danych..."
#: barcodecombo.cpp:166
-#, fuzzy
msgid "&Margin:"
msgstr "Margines:"
#: barcodecombo.cpp:173 propertywidget.cpp:140 propertywidget.cpp:466
-#, fuzzy
msgid "&Rotation:"
-msgstr "Rotacja:"
+msgstr "Obrót:"
#: barcodecombo.cpp:180
-#, fuzzy
msgid "&Scale (in permille):"
-msgstr "Skala (w permillach)"
+msgstr "Skala (w tysiącznych):"
#: barcodecombo.cpp:187
-#, fuzzy
msgid "&Crop:"
-msgstr "Kadr:"
+msgstr "Kadrowanie:"
#: barcodedialog.cpp:46
msgid "Barcode Generator"
@@ -108,7 +104,7 @@ msgstr "TBarcode"
#: barcodedialogs.cpp:67 barcodedialogs.cpp:476
msgid "Barcode Writer in Pure Postscript"
-msgstr ""
+msgstr "Zapisywanie kodu w czystym PostScripcie"
#: barcodedialogs.cpp:73 barcodedialogs.cpp:440
msgid "Colors"
@@ -123,9 +119,8 @@ msgid "Module width (mm):"
msgstr "Szerokość Modułu (mm)"
#: barcodedialogs.cpp:120
-#, fuzzy
msgid "Barcode Height (mm):"
-msgstr "Wysokość (w mm):"
+msgstr "Wysokość kodu (w mm):"
#: barcodedialogs.cpp:123
msgid "&Translate escape sequences"
@@ -277,87 +272,76 @@ msgid "Start:"
msgstr "Start:"
#: barcodedialogs.cpp:451
-#, fuzzy
msgid "Bar Color:"
-msgstr "Kolor ramki:"
+msgstr "Kolor paska:"
#: barcodedialogs.cpp:452
-#, fuzzy
msgid "Background Color:"
-msgstr "Kolor ramki:"
+msgstr "Kolor tła:"
#: barcodedialogs.cpp:453
-#, fuzzy
msgid "Text Color:"
-msgstr "&Kolor tekstu..."
+msgstr "Kolor tekstu:"
#: barcodedialogs.cpp:479
-#, fuzzy
msgid "Enable &Checksum"
-msgstr "Bez sumy kontrolnej"
+msgstr "Z sumą kontrolną"
#: barcodeprinterdlg.cpp:31
-#, fuzzy
msgid "Barcode Printer"
-msgstr "Numer Kodu"
+msgstr "Drukarka kodów"
#: barcodeprinterdlg.cpp:36
-#, fuzzy
msgid "&Output Format:"
-msgstr "Format pliku wyjściowego"
+msgstr "Format wyjściowy:"
#: barcodeprinterdlg.cpp:40
msgid "&Print to File"
-msgstr ""
+msgstr "Drukuj do pliku"
#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
-#, fuzzy
msgid "&Filename:"
-msgstr "Nazwa pliku"
+msgstr "Nazwa pliku:"
#: barcodeprinterdlg.cpp:46
msgid "&Device:"
-msgstr ""
+msgstr "Urządzenie:"
#: barcodeprinterdlg.cpp:58
msgid "TEC Printer (TEC)"
-msgstr ""
+msgstr "Drukarka TEC (TEC)"
#: barcodeprinterdlg.cpp:59
msgid "Zebra Printer (ZPL)"
-msgstr ""
+msgstr "Drukarka Zebra (ZPL)"
#: barcodeprinterdlg.cpp:60
msgid "Intermec Printer (IPL)"
-msgstr ""
+msgstr "Drukarka Intermec (IPL)"
#: barcodeprinterdlg.cpp:61
msgid "EPCL Printer (EPCL)"
-msgstr ""
+msgstr "Drukarka EPCL (EPCL)"
#: barkode.cpp:649
-#, fuzzy
msgid " [GNU Barcode]"
-msgstr "Nowy kod kreskowy"
+msgstr " [GNU Barcode]"
#: barkode.cpp:652
-#, fuzzy
msgid " [PDF 417]"
-msgstr "PDF417"
+msgstr " [PDF417]"
#: barkode.cpp:655
-#, fuzzy
msgid " [TBarcode]"
-msgstr "TBarcode"
+msgstr " [TBarcode]"
#: barkode.cpp:658
-#, fuzzy
msgid " [TBarcode2]"
-msgstr "TBarcode"
+msgstr " [TBarcode2]"
#: barkode.cpp:661
msgid " [Barcode Writer in Pure Postscript]"
-msgstr ""
+msgstr " [Zapis do czystego PostScriptu]"
#: barkode.cpp:696
msgid "Raw code 128"
@@ -368,9 +352,8 @@ msgid "Codabar"
msgstr "Codabar"
#: barkode.cpp:698
-#, fuzzy
msgid "Codabar (no checksum)"
-msgstr "Code 39 (bez sumy kontrolnej)"
+msgstr "Codabar (bez sumy kontrolnej)"
#: barkode.cpp:699
msgid "Code 128 (a,b,c: autoselection)"
@@ -444,7 +427,7 @@ msgstr "Tworzenie obrazów..."
#: batchprinter.cpp:337
msgid "<qt>Can't open the file or device <b>%1</b></qt>."
-msgstr ""
+msgstr "<qt>Nie można otworzyć pliku lub urządzenia <b>%1</b></qt>."
#: batchwizard.cpp:117
msgid ""
@@ -452,50 +435,49 @@ msgid ""
"with KBarcode.<br>The first step is to select the KBarcode label file you "
"want to print.</qt>"
msgstr ""
+"<qt>Ten program poprowadzi Cię przez proces zwielokrotnionego drukowania "
+"etykiet w KBarCode.<br>Pierwszym krokiem jest wybór pliku etykiety, który ma "
+"zostać wydrukowany.</qt>"
#: batchwizard.cpp:135
-#, fuzzy
msgid "File Selection"
-msgstr "Opis artykułu"
+msgstr "Wybór pliku"
#: batchwizard.cpp:147
msgid "Print &labels without data"
-msgstr ""
+msgstr "Drukuj etykiety bez danych"
#: batchwizard.cpp:148
msgid "Print &articles from KBarcodes SQL database"
-msgstr ""
+msgstr "Drukuj artykuły z bazy SQL KBarCodes"
#: batchwizard.cpp:149
msgid "Import &variables and print"
-msgstr ""
+msgstr "Importuj wartości i drukuj"
#: batchwizard.cpp:150
msgid "Print &contacts from your addressbook"
-msgstr ""
+msgstr "Drukuj kontakty z książki adresowej"
#: batchwizard.cpp:162
msgid "Data Source"
-msgstr ""
+msgstr "Źródło danych"
#: batchwizard.cpp:174
-#, fuzzy
msgid "Print Data"
-msgstr "&Drukuj"
+msgstr "Drukowanie danych"
#: batchwizard.cpp:185
-#, fuzzy
msgid "Insert Row"
-msgstr "Wstaw &kod kreskowy"
+msgstr "Wstaw wiersz"
#: batchwizard.cpp:187
msgid "Delete Row"
-msgstr ""
+msgstr "Usuń wiersz"
#: batchwizard.cpp:194
-#, fuzzy
msgid "Import Variables"
-msgstr "Importuj do tablicy"
+msgstr "Importuj wartości"
#: batchwizard.cpp:206
msgid ""
@@ -505,43 +487,42 @@ msgid ""
"least one number. This number is increased for every printed label on the "
"print out.</qt>"
msgstr ""
+"<qt>KBarcode może umieszczać numery seryjne na etykietach. Jeżeli nie został "
+"użyty znacznik [serial] w etykietach, można pominąć tą stronę.<br>Numer "
+"startowy może być dowolny i jest zwiększany o jeden przy drukowaniu każdej "
+"etykiety.</qt>"
#: batchwizard.cpp:216 previewdialog.cpp:104
-#, fuzzy
msgid "Serial start:"
-msgstr "Start:"
+msgstr "Wartość startowa:"
#: batchwizard.cpp:220 previewdialog.cpp:106
msgid "Serial increment:"
-msgstr ""
+msgstr "Krok numeru:"
#: batchwizard.cpp:223
-#, fuzzy
msgid "Serial Number"
-msgstr "Numer artykułu"
+msgstr "Numer seryjny"
#: batchwizard.cpp:233
msgid "&Print to a system printer or to a file"
-msgstr ""
+msgstr "Drukowanie do pliku lub drukarki systemowej"
#: batchwizard.cpp:234
-#, fuzzy
msgid "&Create images"
-msgstr "&Utwórz obrazy..."
+msgstr "Tworzenie obrazów"
#: batchwizard.cpp:239
msgid "Print to a special &barcode printer"
-msgstr ""
+msgstr "Drukowanie do drukarki kodów kreskowych"
#: batchwizard.cpp:243
-#, fuzzy
msgid "Output &Directory:"
-msgstr "Wybierz docelowy katalog"
+msgstr "Katalog docelowy"
#: batchwizard.cpp:249
-#, fuzzy
msgid "Output File &Format:"
-msgstr "Format pliku wyjściowego"
+msgstr "Format pliku wyjściowego:"
#: batchwizard.cpp:259
msgid "Use &article number for filename"
@@ -552,36 +533,32 @@ msgid "Use &barcode number for filename"
msgstr "Użyj numeru &kodu jako nazwy pliku"
#: batchwizard.cpp:261
-#, fuzzy
msgid "Use &custom filename:"
-msgstr "Użyj nazwy numeru &artykułu jako nazwy pliku"
+msgstr "Użyj własnej nazwy pliku:"
#: batchwizard.cpp:269
msgid "&Keep window open after printing."
-msgstr ""
+msgstr "Pozostaw otwarte okno po drukowaniu."
#: batchwizard.cpp:287
msgid "Output Device"
-msgstr ""
+msgstr "Urządzenie wyjścia"
#: batchwizard.cpp:298
msgid "Customer name and no.:"
msgstr "Nazwa klienta i numer.:"
#: batchwizard.cpp:305
-#, fuzzy
msgid "&Add..."
-msgstr "&Zaawansowane..."
+msgstr "Dodaj..."
#: batchwizard.cpp:306
-#, fuzzy
msgid "&Import..."
-msgstr "&Importuj"
+msgstr "Importuj..."
#: batchwizard.cpp:307
-#, fuzzy
msgid "&Edit..."
-msgstr "&Edytor Etykiet"
+msgstr "Edycja..."
#: batchwizard.cpp:309
msgid "R&emove All"
@@ -619,83 +596,76 @@ msgstr "Grupa"
#: batchwizard.cpp:343
msgid "Enter &data manually"
-msgstr ""
+msgstr "Ręczne wprowadzanie danych"
#: batchwizard.cpp:344
msgid "Import variables from a &SQL table"
-msgstr ""
+msgstr "Importowanie wartości z tabeli SQL"
#: batchwizard.cpp:345
-#, fuzzy
msgid "Please enter a sql &query:"
-msgstr "Wprowadź opis:"
+msgstr "Wprowadź kwerendę SQL:"
#: batchwizard.cpp:349
-#, fuzzy
msgid "Import from a &CSV file"
-msgstr "Importuj z pliku..."
+msgstr "Importowanie z pliku CSV"
#: batchwizard.cpp:350
msgid "Please select a csv &file:"
-msgstr ""
+msgstr "Wybierz plik CSV:"
#: batchwizard.cpp:353
-#, fuzzy
msgid "&Encoding:"
-msgstr "Rodzaj Kodowania"
+msgstr "Kodowanie:"
#: batchwizard.cpp:362
msgid "Available Variables:"
-msgstr ""
+msgstr "Dostępne zmienne:"
#: batchwizard.cpp:380
-#, fuzzy
msgid "&Number of labels to print:"
-msgstr "Liczba etykiet:"
+msgstr "Liczba drukowanych etykiet:"
#: batchwizard.cpp:411
msgid "Add all contacts to the list of contacts which will be printed."
-msgstr ""
+msgstr "Dodaj wszystkie kontakty do listy drukowanych."
#: batchwizard.cpp:412
msgid "Add selected contacts to the list of contacts which will be printed."
-msgstr ""
+msgstr "Dodaj wybrane kontakty do listy drukowanych."
#: batchwizard.cpp:413
msgid ""
"Remove selected contacts from the list of contacts which will be printed."
-msgstr ""
+msgstr "Usuń wybrane kontakty z listy drukowanych."
#: batchwizard.cpp:414
msgid "Remove all contacts from the list of contacts which will be printed."
-msgstr ""
+msgstr "Usuń wszystkie kontakty z listy drukowanych."
#: batchwizard.cpp:430
msgid "All Addresses"
-msgstr ""
+msgstr "Wszystkie adresy"
#: batchwizard.cpp:431
msgid "Selected Addresses"
-msgstr ""
+msgstr "Wybrane adresy"
#: batchwizard.cpp:434 batchwizard.cpp:445
-#, fuzzy
msgid "Given Name"
-msgstr "Nazwa pliku"
+msgstr "Imię"
#: batchwizard.cpp:435 batchwizard.cpp:446
-#, fuzzy
msgid "Family Name"
-msgstr "Nazwa pliku"
+msgstr "Nazwisko"
#: batchwizard.cpp:436 batchwizard.cpp:447
msgid "Email Address"
-msgstr ""
+msgstr "Adres e-mail"
#: batchwizard.cpp:561
-#, fuzzy
msgid "The label file %1 was not found"
-msgstr "Plik %1 nie istnieje."
+msgstr "Plik etykiety %1 nie został znaleziony"
#: batchwizard.cpp:743
msgid "Please enter a valid article ID"
@@ -709,15 +679,14 @@ msgstr "Separator jest pusty. Wypełnij go do jakiejś wartości."
msgid "<qt>The following items can not be added:"
msgstr "<qt>Następujące pozycje nie mogą być dodane:"
-#: batchwizard.cpp:1052
-#, fuzzy
+#: batchwizard.cpp:1051
msgid "<qt>Can't execute SQL query:<br>"
-msgstr "<qt>Nie mozna wykonać polecenia:<br><b>"
+msgstr "<qt>Nie można wykonać zapytania SQL:<br>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
-msgstr ""
+msgstr "Nie można otworzyć pliku: %1"
#: commands.cpp:434
msgid "New Rectangle"
@@ -732,9 +701,8 @@ msgid "New Text"
msgstr "Nowy tekst"
#: commands.cpp:475
-#, fuzzy
msgid "New TextLine"
-msgstr "Nowa Linia"
+msgstr "Nowa Linia tekstu"
#: commands.cpp:492
msgid "New Barcode"
@@ -742,61 +710,55 @@ msgstr "Nowy kod kreskowy"
#: commands.h:142
msgid "Resized Item"
-msgstr ""
+msgstr "Przeskalowany element"
#: commands.h:170
-#, fuzzy
msgid "Moved Item"
-msgstr "Dodaj pozycję"
+msgstr "Przeniesiony element"
#: commands.h:185
msgid "Raised or lowered an item"
-msgstr ""
+msgstr "Element przesunięty wyżej lub niżej"
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
msgid "Protected Item"
-msgstr ""
+msgstr "Element zabezpieczony"
#: commands.h:221
-#, fuzzy
msgid "Changed Settings"
-msgstr "Ustawienia Kodu"
+msgstr "Zmienione Ustawienia"
#: commands.h:244 commands.h:276
-#, fuzzy
msgid "Changed Text"
-msgstr "Nowy tekst"
+msgstr "Zmodyfikowany tekst"
#: commands.h:258
-#, fuzzy
msgid "Rotated Text"
-msgstr "Nowy tekst"
+msgstr "Obrócony tekst"
#: commands.h:297
-#, fuzzy
msgid "Changed Barcode"
-msgstr "Konfiguruj KBarcode"
+msgstr "Zmodyfikowany kod kreskowy"
#: commands.h:308
msgid "New Picture"
msgstr "Nowe zdjęcie"
#: commands.h:377
-#, fuzzy
msgid "Delete Item"
-msgstr "&Wymaż obiekt..."
+msgstr "Usuń element"
#: commands.h:388
msgid "Modified Border"
-msgstr ""
+msgstr "Zmodyfikowane obramowanie"
#: commands.h:407
msgid "Modified Rectangle or Ellipse"
-msgstr ""
+msgstr "Zmodyfikowany prostokąt lub elipsa"
#: commands.h:427
msgid "Changed visibility JavaScript"
-msgstr ""
+msgstr "Zmodyfikowana widoczność JavaScript"
#: configdialog.cpp:46
msgid "There are currently %1 cached barcodes."
@@ -992,17 +954,16 @@ msgid "Example data has been imported."
msgstr "Przykładowe dane zostały importowane."
#: confwizard.cpp:236
-#, fuzzy
msgid ""
"There are no TQt SQL drivers installed. KBarcode needs those drivers to "
"access the different SQL databases. This drivers are part of the TQt Source "
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Nie zainstalowano żadnych sterowników QT SQL. KBarcode potrzebuje ich, aby "
-"mieć dostęp do rozmaitych baz danych SQL. Kontrolery te są częścią składową "
-"dystrybucji źródłowej i powinny być zawarte w twojej dystrybucji. Zainstaluj "
-"je."
+"Nie zainstalowano żadnych sterowników TQT SQL. KBarcode potrzebuje ich, aby "
+"mieć dostęp do rozmaitych baz danych SQL. Sterowniki te są częścią składową "
+"dystrybucji źródłowej TQt i powinny być zawarte w twojej dystrybucji. "
+"Zainstaluj je."
#: csvimportdlg.cpp:61
msgid "&Import"
@@ -1013,22 +974,20 @@ msgid "Import the selected file into your tables."
msgstr "Importuj zaznaczone pliki do tablic"
#: csvimportdlg.cpp:93
-#, fuzzy
msgid "&Import Data"
-msgstr "&Importuj przykładowe dane"
+msgstr "&Import danych"
#: csvimportdlg.cpp:104
-#, fuzzy
msgid "Other table..."
-msgstr "&Zmień etykietę"
+msgstr "Inna tabela..."
#: csvimportdlg.cpp:107
msgid "&Load complete file into preview"
-msgstr ""
+msgstr "Wczytywanie całego pliku do podglądu"
#: csvimportdlg.cpp:109
msgid "Load only a number of datasets:"
-msgstr ""
+msgstr "Wczytywanie zadanej ilości zestawów danych:"
#: csvimportdlg.cpp:120
msgid "Column:"
@@ -1047,53 +1006,48 @@ msgid "File to import:"
msgstr "Plik do importu"
#: csvimportdlg.cpp:133
-#, fuzzy
msgid "Encoding:"
-msgstr "Rodzaj Kodowania"
+msgstr "Kodowanie:"
#: csvimportdlg.cpp:135
msgid "Import into table:"
msgstr "Importuj do tablicy"
#: csvimportdlg.cpp:137
-#, fuzzy
msgid "Table Name:"
-msgstr "Nazwa pliku"
+msgstr "Nazwa tabeli:"
#: csvimportdlg.cpp:151
-#, fuzzy
msgid "&Import Settings"
-msgstr "Ustawienia Wydruku"
+msgstr "Importowanie ustawień"
#: csvimportdlg.cpp:157
-#, fuzzy
msgid "&CSV File"
-msgstr "&Importuj plik CVS"
+msgstr "Plik CSV"
#: csvimportdlg.cpp:158
msgid "File with &fixed field width"
-msgstr ""
+msgstr "Plik o stałej szerokości pól"
#: csvimportdlg.cpp:162
msgid "CSV File"
-msgstr ""
+msgstr "Plik CSV"
#: csvimportdlg.cpp:163
msgid "Fixed Field Width File"
-msgstr ""
+msgstr "Plik o stałej szerokości pól"
#: csvimportdlg.cpp:207
msgid "&Add Field"
-msgstr ""
+msgstr "Dodaj pole"
#: csvimportdlg.cpp:210
-#, fuzzy
msgid "&Remove Field"
-msgstr "&Usuń wszystkie"
+msgstr "Usuń pole"
#: csvimportdlg.cpp:356
msgid "Cannot load data from the file:"
-msgstr ""
+msgstr "Nie można załadować danych z pliku:"
#: csvimportdlg.cpp:377
msgid "Could not import the following line:"
@@ -1136,14 +1090,12 @@ msgid "Type:"
msgstr "Typ:"
#: definitiondialog.cpp:99
-#, fuzzy
msgid "Width (in %1):"
-msgstr "Szerokość (w mm):"
+msgstr "Szerokość (w %1):"
#: definitiondialog.cpp:103
-#, fuzzy
msgid "Height (in %1):"
-msgstr "Wysokość (w mm):"
+msgstr "Wysokość (w %1):"
#: definitiondialog.cpp:107
msgid "Horizontal Gap:"
@@ -1217,48 +1169,41 @@ msgstr "Rozstęp pionowy"
msgid "Horizontal Gap"
msgstr "Rozstęp poziomy"
-#: documentitemdlg.cpp:34
-#, fuzzy
+#: documentitemdlg.cpp:33
msgid "&Position && Size"
-msgstr "Pozycja:"
+msgstr "Pozycja i rozmiar"
-#: documentitemdlg.cpp:37
-#, fuzzy
+#: documentitemdlg.cpp:36
msgid "&Border"
-msgstr "&Porządkuj"
+msgstr "Obramowanie"
-#: documentitemdlg.cpp:42
-#, fuzzy
+#: documentitemdlg.cpp:41
msgid "&Fill Color"
-msgstr "Wypełnij kolorem:"
+msgstr "Kolor wypełnienia"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "&Kod kreskowy"
-#: documentitemdlg.cpp:52
-#, fuzzy
+#: documentitemdlg.cpp:51
msgid "&Rotation"
-msgstr "Rotacja:"
+msgstr "Obrót"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
-#, fuzzy
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
msgid "&Text"
-msgstr "Nowy tekst"
+msgstr "Tekst"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
-#, fuzzy
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
msgid "&Image"
-msgstr "...jako &Obraz"
+msgstr "Obraz"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
-msgstr ""
+msgstr "Widoczność"
-#: documentitemdlg.cpp:109
-#, fuzzy
+#: documentitemdlg.cpp:108
msgid "Property changed"
-msgstr "Koordynator projektu"
+msgstr "Zmieniona właściwość"
#: dsmainwindow.cpp:71
msgid "&Start Configuration Wizard..."
@@ -1289,25 +1234,23 @@ msgid "&System Check..."
msgstr "&Sprawdzian systemu"
#: dsmainwindow.cpp:180
-#, fuzzy
msgid ""
"<qt>The KBarcode documentation is avaible as PDF for download here.<br><br>"
msgstr ""
-"<qt>Dokumantacja KBarcode jest dostępna jako plik PDF do ściągnięcia z "
-"naszej witryny.<br><br>"
+"<qt>Dokumantacja KBarcode jest dostępna jako plik PDF do ściągnięcia tutaj."
+"<br><br>"
#: dsmainwindow.cpp:182
msgid "Download Now"
msgstr "Pobierz teraz"
#: dsmainwindow.cpp:211
-#, fuzzy
msgid ""
"<qt>It is possible to support the further development of KBarcode through "
"donations.<br><br>"
msgstr ""
"<qt>Istnieje możliwość wspierania dalszego rozwoju programu KBarcode przez "
-"darowizny. Do tego celu zostanie użyty system PayPal.<br><br>"
+"darowizny.<br><br>"
#: dsmainwindow.cpp:213
msgid "Donate Now"
@@ -1352,7 +1295,7 @@ msgstr ""
#: imageitem.cpp:267
msgid "Expression: "
-msgstr ""
+msgstr "Wyrażenie: "
#: kbarcode.cpp:51
msgid "Barcode &Generator..."
@@ -1391,8 +1334,10 @@ msgid ""
"%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
"IMAGE and BARCODE."
msgstr ""
+"%1 nie jest prawidłowym formatem wyjściowym dla --output. Prawidłowe formaty "
+"to POSTSCRIPT, IMAGE i BARCODE."
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Statyczny"
@@ -1405,6 +1350,8 @@ msgid ""
"<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
"qt>"
msgstr ""
+"<qt>Plik <b>%1</b> nie może zostać otwarty z powodu braku definicji etykiet."
+"</qt>"
#: labeleditor.cpp:444
msgid "Close &Label"
@@ -1428,12 +1375,11 @@ msgstr "&Wymaż obiekt..."
#: labeleditor.cpp:456
msgid "Print to &Barcode Printer..."
-msgstr ""
+msgstr "Drukuj do drukarki kodów..."
#: labeleditor.cpp:457
-#, fuzzy
msgid "Print to &Image..."
-msgstr "Tworzenie obrazów..."
+msgstr "Drukuj do obrazka..."
#: labeleditor.cpp:458
msgid "&Change Label..."
@@ -1452,14 +1398,12 @@ msgid "Insert &Text"
msgstr "Wstaw &tekst"
#: labeleditor.cpp:464 multilineeditdlg.cpp:137 textlineedit.cpp:90
-#, fuzzy
msgid "Insert &Data Field"
-msgstr "Wstaw pole bazy &danych"
+msgstr "Wstaw pole danych"
#: labeleditor.cpp:465
-#, fuzzy
msgid "Insert &Text Line"
-msgstr "Wstaw &tekst"
+msgstr "Wstaw linię tekstu"
#: labeleditor.cpp:466
msgid "Insert &Line"
@@ -1527,37 +1471,37 @@ msgstr "&Centruj"
#: labeleditor.cpp:595
msgid "&Protect Position and Size"
-msgstr ""
+msgstr "Zablokuj położenie i rozmiar"
#: labeleditor.cpp:597
msgid "&Properties"
msgstr "&Właściwości"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Opis etykiety"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Wprowadź opis:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Wymiar:"
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Szablon etykiety:"
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Ortografia"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "Plik %1 nie istnieje."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>Dokument został zmodyfikowany.<br> <br>Czy chcesz go zapisać?</qt>"
@@ -1567,165 +1511,163 @@ msgid ""
"Load the file in KBarcode (if --batch is specified, the file will be used in "
"batchprinting mode)"
msgstr ""
+"Załaduj plik w KBarcode (jeżeli podano --batch, plik zostanie użyty do "
+"drukowania wsadowego)"
#: main.cpp:36
msgid ""
"Print any loaded files immediately on the default printer or on the printer "
"specified by the --printer commandline option and exit afterwards"
msgstr ""
+"Drukuj otwarte pliki na domyślnej drukarce lub drukarce podanej w argumencie "
+"--printer i zakończ pracę"
#: main.cpp:38
msgid "Printer/destination to print on"
msgstr "Docelowa drukarka/ścieżka"
#: main.cpp:39
-#, fuzzy
msgid "KBarcode Modes:"
-msgstr "KBarcode"
+msgstr "Tryby KBarcode:"
#: main.cpp:40
-#, fuzzy
msgid "Start KBarcode as xbarcode replacement"
-msgstr "startuj jako zamiennik dla xbarcode"
+msgstr "Startuj KBarcode jako zamiennik dla xbarcode"
#: main.cpp:41
-#, fuzzy
msgid "Open the label editor"
-msgstr "startuj edytora etykiet"
+msgstr "Otwórz edytor etykiet"
#: main.cpp:42
-#, fuzzy
msgid "Start directly in batchprinting mode"
-msgstr "startuj w trybie wsadowym"
+msgstr "Startuj bezpośrednio w trybie wsadowym"
#: main.cpp:43
msgid "Additional options for batchprinting (--batch):"
-msgstr ""
+msgstr "Dodatkowe opcje drukowania wsadowego (--batch):"
#: main.cpp:44
msgid "Output format where mode is one of POSTSCRIPT|IMAGE|BARCODE"
-msgstr ""
+msgstr "Format wyjściowy, jeden z POSTSCRIPT|IMAGE|BARCODE"
#: main.cpp:45
msgid "Set the serial number to be used"
-msgstr ""
+msgstr "Używany numer serii"
#: main.cpp:46
msgid ""
"Increase a previously specified serial number using this value for each "
"printed label"
msgstr ""
+"Inkrementuje poprzednio podany numer seryjny co etykieta dodając daną wartość"
#: main.cpp:47
msgid "Print <value> labels without any data"
-msgstr ""
+msgstr "Drukowanie etykiet <value> bez danych"
#: main.cpp:48
msgid "Import variable data from a specified sql query"
-msgstr ""
+msgstr "Importowanie danych zmiennej z zadanego zapytania SQL"
#: main.cpp:49
msgid "Import variable data from a specified csv file"
-msgstr ""
+msgstr "Importowanie danych zmiennej z zadanego pliku CSV"
#: main.cpp:84
-#, fuzzy
msgid "KBarcode"
-msgstr "Kod kreskowy"
+msgstr "KBarcode"
#: main.cpp:85
msgid "KBarcode is a barcode and label printing application for TDE."
msgstr "KBarcode jest aplikacją TDE, która drukuje kody paskowe i etykiety."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Programista"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Koordynator projektu"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "Stworzył GNU Barcode, na którym bazuje KBarcode."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
-msgstr ""
+msgstr "Autor Barcode Writer w czystym Postscripcie"
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Włoskie tłumaczenie"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Fińskie i szwedzkie tłumaczenie, autor ikonki KBarcode"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Hiszpańskie tłumaczenie"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Tłumaczenie węgierskie"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Ikonka zakładki skradziona z jego wspaniałej aplikacji qtella"
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "Napisał RichText KPart"
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Tłumaczenie Francuzkie"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "Pomoc w kodzie ZPL i IPL"
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
-msgstr ""
+msgstr "Autor wielu usprawnień dla KBarcode"
-#: main.cpp:110
-#, fuzzy
+#: main.cpp:108
msgid "Made the Netherlands translation"
-msgstr "Włoskie tłumaczenie"
+msgstr "Tłumaczenie na język holenderski"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
-msgstr ""
+msgstr "Dodanie wielu użytecznych pól danych do kbarcode"
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
-msgstr ""
+msgstr "Dodanie wsparcia drukarek TEC"
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
-msgstr ""
+msgstr "Dodanie wsparcia drukarek EPCL"
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
-msgstr ""
+msgstr "Naprawy błędów."
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
-msgstr ""
+msgstr "Opiekun (Projekt TDE)"
#: measurements.cpp:51
msgid "mm"
-msgstr ""
+msgstr "mm"
#: measurements.cpp:52
msgid "in"
-msgstr ""
+msgstr "cal"
#: mimesources.cpp:33
-#, fuzzy
msgid "Pasted Object"
-msgstr "&Wymaż obiekt..."
+msgstr "Wklejony obiekt"
#: multilineeditdlg.cpp:95
msgid "&Bold"
@@ -1793,7 +1735,7 @@ msgstr "Etykieta"
#: newlabel.cpp:72
msgid "&Start with an empty label"
-msgstr ""
+msgstr "Początek z pustą etykietą"
#: newlabel.cpp:102
msgid "&Add own Label Definition"
@@ -1808,38 +1750,32 @@ msgstr ""
"Szerokość: "
#: newlabel.cpp:169
-#, fuzzy
msgid "%1<br>Height: "
-msgstr "mm<br>Wysokość: "
+msgstr "%1<br>Wysokość: "
#: newlabel.cpp:170
-#, fuzzy
msgid "%2<br>Horizontal Gap: "
-msgstr "mm<br>Rozstęp poziomy: "
+msgstr "%2<br>Odstęp poziomy: "
#: newlabel.cpp:171
-#, fuzzy
msgid "%3<br>Vertical Gap: "
-msgstr "mm<br>Rozstęp pionowy:"
+msgstr "%3<br>Odstęp pionowy: "
#: newlabel.cpp:172
-#, fuzzy
msgid "%4<br>Top Gap: "
-msgstr "mm<br>Rozstęp górny:"
+msgstr "%4<br>Odstęp górny: "
#: newlabel.cpp:173
-#, fuzzy
msgid "%5<br>Left Gap: "
-msgstr "mm<br>Rozstęp lewy:"
+msgstr "%5<br>Odstęp lewy: "
#: newlabel.cpp:192
msgid "No label selected."
-msgstr ""
+msgstr "Nie wybrano etykiety."
#: previewdialog.cpp:89
-#, fuzzy
msgid "Select &Address"
-msgstr "Wstaw &Adres"
+msgstr "Wybierz &Adres"
#: previewdialog.cpp:95
msgid "Customer Name and No.:"
@@ -1858,9 +1794,8 @@ msgid "Index:"
msgstr "Indeks:"
#: previewdialog.cpp:108
-#, fuzzy
msgid "Addressbook entry:"
-msgstr "Ksi&ążka adresowa"
+msgstr "Wpis z książki adresowej:"
#: printersettings.cpp:39
msgid "ISO A3"
@@ -1884,7 +1819,7 @@ msgstr "US Legal"
#: printersettings.cpp:44
msgid "Screen"
-msgstr ""
+msgstr "Ekran"
#: printersettings.cpp:46
msgid "ISO B5"
@@ -1988,7 +1923,7 @@ msgstr "&Drukuj znaki kadru (ramki)"
#: propertywidget.cpp:90
msgid "&Border Visible"
-msgstr ""
+msgstr "Widoczna granica"
#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
msgid "Color:"
@@ -2003,17 +1938,16 @@ msgid "Line Style:"
msgstr "Styl kreski:"
#: propertywidget.cpp:145 propertywidget.cpp:485
-#, fuzzy
msgid "90"
-msgstr "0"
+msgstr "90"
#: propertywidget.cpp:146 propertywidget.cpp:486
msgid "180"
-msgstr ""
+msgstr "180"
#: propertywidget.cpp:147 propertywidget.cpp:487
msgid "270"
-msgstr ""
+msgstr "270"
#: propertywidget.cpp:212
msgid "Barcode Settings:"
@@ -2021,68 +1955,60 @@ msgstr "Ustawienia kodu:"
#: propertywidget.cpp:346
msgid "&Protect item from being moved or resized"
-msgstr ""
+msgstr "Zabezpiecz element przed przemieszczaniem i zmianą rozmiaru"
#: propertywidget.cpp:357
-#, fuzzy
msgid "&Top:"
-msgstr "&Na wierzch"
+msgstr "Góra:"
#: propertywidget.cpp:358
-#, fuzzy
msgid "&Left:"
-msgstr "Rozstęp lewy:"
+msgstr "Lewy:"
#: propertywidget.cpp:359
-#, fuzzy
msgid "&Height:"
-msgstr "mm<br>Wysokość: "
+msgstr "Wysokość:"
#: propertywidget.cpp:360
-#, fuzzy
msgid "&Width:"
-msgstr "Szerokość kreski:"
+msgstr "Szerokość:"
#: propertywidget.cpp:471
-#, fuzzy
msgid "&Load image from path"
-msgstr "Nieobsługiwany format obrazu"
+msgstr "Wczytaj obraz ze ścieżki"
#: propertywidget.cpp:475
msgid "&Read image path from expression"
-msgstr ""
+msgstr "Odczytaj ścieżkę obrazu z wyrażenia"
#: propertywidget.cpp:489
-#, fuzzy
msgid "&Size"
-msgstr "Wymiar:"
+msgstr "Rozmiar"
#: propertywidget.cpp:491
msgid "&None"
-msgstr ""
+msgstr "Brak"
#: propertywidget.cpp:493
msgid "S&cale"
-msgstr ""
+msgstr "Skalowanie"
#: propertywidget.cpp:495
-#, fuzzy
msgid "Mirror &Horizontaly"
-msgstr "Centruj po&ziomo"
+msgstr "Odbij poziomo"
#: propertywidget.cpp:496
-#, fuzzy
msgid "Mirror &Vertically"
-msgstr "Centruj pio&nowo"
+msgstr "Odbij pionowo"
#: propertywidget.cpp:522
#, c-format
msgid "Image format not supported for file: %1"
-msgstr ""
+msgstr "Nieobsługiwany format obrazu w pliku: %1"
#: propertywidget.cpp:611
msgid "Evaluate JavsScript code to define the visibility of this item:"
-msgstr ""
+msgstr "Widoczność obiektu ustalana wyrażeniem JavaScript:"
#: rectsettingsdlg.cpp:54 rectsettingsdlg.cpp:145
msgid "Settings"
@@ -2109,19 +2035,16 @@ msgid "Add Barcode_basic"
msgstr "Dodaj Barcode_basic"
#: smalldialogs.cpp:61
-#, fuzzy
msgid "Add Items"
-msgstr "Dodaj pozycję"
+msgstr "Dodaj elementy"
#: smalldialogs.cpp:68
-#, fuzzy
msgid "Edit Item"
-msgstr "Dodaj pozycję"
+msgstr "Edytuj elementy"
#: smalldialogs.cpp:92
-#, fuzzy
msgid "Article:"
-msgstr "No. Artykułu"
+msgstr "Artykuł:"
#: sqltables.cpp:123
msgid "<qt>Unable to open database: "
@@ -2144,14 +2067,12 @@ msgid "<br>You can continue if the database exists already.</qt>"
msgstr "<br>Możesz kontynuować jeśli baza już istnieje.</qt>"
#: sqltables.cpp:183
-#, fuzzy
msgid "<qt>Can't connect to database to create table."
-msgstr "Nie można połaczyć się z bazą danych."
+msgstr "<qt>Nie można połączyć się z bazą danych by utworzyć tabelę."
#: sqltables.cpp:183
-#, fuzzy
msgid "<br>You can continue if the table exists already.</qt>"
-msgstr "<br>Możesz kontynuować jeśli baza już istnieje.</qt>"
+msgstr "<br>Możesz kontynuować jeśli tabela już istnieje.</qt>"
#: sqltables.cpp:195
msgid ""
@@ -2179,6 +2100,8 @@ msgid ""
"Data file for import not found. Continuing without importing data. Please "
"check your KBarcode installation."
msgstr ""
+"Nie znaleziono pliku z importowanymi danymi. Kontynuacja pracy bez "
+"importowania danych. Proszę sprawdzić instalację KBarcode."
#: sqltables.cpp:326
msgid "SQL import progress:"
@@ -2242,92 +2165,87 @@ msgstr "<b>Musisz wypróbować ustawienia bazy zanim przejdziesz dalej.</b>"
#: textlineedit.cpp:130
msgid "&Mag. Vert.:"
-msgstr ""
+msgstr "Powiększenie pionowe:"
#: textlineedit.cpp:132
msgid "&Mag. Hor.:"
-msgstr ""
+msgstr "Powiększenie poziome:"
#: tokendialog.cpp:65 tokendialog.cpp:93 tokendialog.cpp:109
msgid "What do you want to insert?"
-msgstr ""
+msgstr "Co chcesz wstawić?"
#: tokendialog.cpp:67
-#, fuzzy
msgid "Insert a &fixed data field"
-msgstr "Wstaw pole bazy &danych"
+msgstr "Wstaw stałe pole danych"
#: tokendialog.cpp:68
msgid "Insert a &custom SQL query, variable or JavaScript function"
-msgstr ""
+msgstr "Wstaw własne zapytanie SQL, zmienną lub funkcję JavaScript"
#: tokendialog.cpp:72
msgid "Step 1 of 3"
-msgstr ""
+msgstr "Krok 1 z 3"
#: tokendialog.cpp:79
msgid "Step 2 of 3"
-msgstr ""
+msgstr "Krok 2 z 3"
#: tokendialog.cpp:86
msgid "Step 3 of 3"
-msgstr ""
+msgstr "Krok 3 z 3"
#: tokendialog.cpp:94
msgid "&Select from a list of all tokens"
-msgstr ""
+msgstr "Wybierz z listy wszystkich znaczników"
#: tokendialog.cpp:95
msgid "Insert printing &informations"
-msgstr ""
+msgstr "Wstaw informacje drukowania"
#: tokendialog.cpp:96
-#, fuzzy
msgid "&Insert a database field"
-msgstr "Wstaw pole bazy &danych"
+msgstr "Wstaw pole bazy danych"
#: tokendialog.cpp:97
msgid "Insert a &date/time function"
-msgstr ""
+msgstr "Wstaw funkcję daty/czasu"
#: tokendialog.cpp:98
-#, fuzzy
msgid "Insert an &addressbook field"
-msgstr "Wstaw &Adres"
+msgstr "Wstaw adres z książki adresowej"
#: tokendialog.cpp:111
msgid "Insert a custom &variable"
-msgstr ""
+msgstr "Wstaw własną zmienną"
#: tokendialog.cpp:112
-#, fuzzy
msgid "Insert a &SQL query"
-msgstr "Wstaw kresk&ę"
+msgstr "Wstaw zapytanie SQL"
#: tokendialog.cpp:113
msgid "Insert a &JavaScript function"
-msgstr ""
+msgstr "Wstaw funkcję JavaScript"
#: tokendialog.cpp:135
msgid "&Category:"
-msgstr ""
+msgstr "Kategoria:"
#: tokendialog.cpp:139
msgid "&Token:"
-msgstr ""
+msgstr "Znacznik:"
#: tokendialog.cpp:141 tokendialog.cpp:176
msgid "Token"
-msgstr ""
+msgstr "Znacznik"
#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
msgid "Description"
-msgstr "Opis etykiety"
+msgstr "Opis"
#: tokendialog.cpp:146
msgid "&Custom Expression to be inserted in the token."
-msgstr ""
+msgstr "Własne wyrażenie do umieszczenia w znaczniku."
#: tokendialog.cpp:151
msgid ""
@@ -2335,211 +2253,205 @@ msgid ""
"the case of the sqlquery token, the sure has to enter a sql query in this "
"text field.</qt>"
msgstr ""
+"<qt>Niektóre znaczniki, na przykład sqlquery, wymagają dodatkowych "
+"argumentów. w przypadku znacznika sqlquery należy umieścić w tym polu "
+"tekstowym zapytanie SQL.</qt>"
#: tokendialog.cpp:191
-#, fuzzy
msgid "&Create a new custom variable"
-msgstr "&Utwórz nową etykietę przy starcie"
+msgstr "Utwórz nową własną zmienną"
#: tokendialog.cpp:194
msgid "&Insert an existing custom variable"
-msgstr ""
+msgstr "Wstaw istniejącą własną zmienną"
#: tokendialog.cpp:219
msgid ""
"<qt><b>No SQL connection found!</b><br>You can build a query, but you will "
"not be able to execute or test it right now.<br></qt>"
msgstr ""
+"<qt><b>Nie znaleziono połączenia SQL!</b><br>Możliwa jest edycja kwerendy, "
+"jednak nie będzie można jej uruchomić ani sprawdzić.<br></qt>"
#: tokendialog.cpp:224
msgid "&SQL Query:"
-msgstr ""
+msgstr "Kwerenda SQL:"
#: tokendialog.cpp:226
msgid "&Test"
-msgstr ""
+msgstr "Test"
#: tokendialog.cpp:231
msgid "Query test results:"
-msgstr ""
+msgstr "Wynik sprawdzenia:"
#: tokendialog.cpp:246
msgid "/* Place your JavaScript code into this text field. */\n"
-msgstr ""
+msgstr "/* Umieść w tym polu swój kod JavaScript. */\n"
#: tokendialog.cpp:339
msgid "All"
-msgstr ""
+msgstr "Wszystkie"
#: tokendialog.cpp:352 tokendialog.cpp:420
-#, fuzzy
msgid "Variable defined by the user for this label."
-msgstr "Pola bazy danych dla tej klolumny"
+msgstr "Zmienna zdefiniowana przez użytkownika dla tej etykiety."
#: tokendialog.cpp:417 tokenprovider.cpp:209
-#, fuzzy
msgid "Custom Values"
-msgstr "Nazwa klienta"
+msgstr "Własne wartości"
#: tokenprovider.cpp:210
msgid "Date & Time"
-msgstr ""
+msgstr "Data i czas"
#: tokenprovider.cpp:211
-#, fuzzy
msgid "Addressbook"
-msgstr "Ksi&ążka adresowa"
+msgstr "Książka adresowa"
#: tokenprovider.cpp:216
-#, fuzzy
msgid "Article description from barcode_basic"
-msgstr "Opis artykułu"
+msgstr "Opis artykułu z barcode_basic"
#: tokenprovider.cpp:217
-#, fuzzy
msgid "Article number from barcode_basic"
-msgstr "Importuj barcode_basic"
+msgstr "Numer artykułu z barcode_basic"
#: tokenprovider.cpp:224
msgid "customer number of the current customer"
-msgstr ""
+msgstr "Numer bieżącego klienta"
#: tokenprovider.cpp:225
msgid "name of the current customer"
-msgstr ""
+msgstr "Nazwa bieżącego klienta"
#: tokenprovider.cpp:226
-#, fuzzy
msgid "Barcode number from barcode_basic"
-msgstr "Importuj barcode_basic"
+msgstr "Numer kodu kreskowego z barcode_basic"
#: tokenprovider.cpp:228
msgid "group of the current article"
-msgstr ""
+msgstr "Grupa bieżącego artykułu"
#: tokenprovider.cpp:229
msgid "Barcode encoding type from barcode_basic"
-msgstr ""
+msgstr "Kodowanie kodu kreskowego z barcode_basic"
#: tokenprovider.cpp:230
msgid "User readable barcode encoding type from barcode_basic"
-msgstr ""
+msgstr "Kodowanie kodu kreskowego (wersja tekstowa) z barcode_basic"
#: tokenprovider.cpp:235
msgid "Path and filename of this file"
-msgstr ""
+msgstr "Ścieżka i nazwa tego pliku"
#: tokenprovider.cpp:236
msgid "number of labels currently printed during this printout"
-msgstr ""
+msgstr "Ilość etykiet wydrukowanych podczas tego drukowania"
#: tokenprovider.cpp:237
msgid "current column on the page"
-msgstr ""
+msgstr "Bieżąca kolumna na stronie"
#: tokenprovider.cpp:238
msgid "current row on the page"
-msgstr ""
+msgstr "Bieżący wiersz na stronie"
#: tokenprovider.cpp:239
-#, fuzzy
msgid "Current page"
-msgstr "Bieżąca tablica: <b>"
+msgstr "Bieżąca strona"
#: tokenprovider.cpp:240
-#, fuzzy
msgid "Current resolution"
-msgstr "Rozdzielczość drukarki"
+msgstr "Bieżąca rozdzielczość"
#: tokenprovider.cpp:241
msgid "Include a serial number on your labels."
-msgstr ""
+msgstr "Dodawanie numeru seryjnego na etykietach."
#: tokenprovider.cpp:247
msgid "Execute java script code"
-msgstr ""
+msgstr "Wykonanie kodu JavaScript"
#: tokenprovider.cpp:248
msgid "Insert the result of a custom sql query"
-msgstr ""
+msgstr "Wstawianie wyniku własnej kwerendy SQL"
#: tokenprovider.cpp:249
msgid "Insert a custom variable"
-msgstr ""
+msgstr "Wstawianie własnej zmiennej"
#: tokenprovider.cpp:254
msgid "Date formated as configured in the preferences"
-msgstr ""
+msgstr "Data formatowana zgodnie z ustawieniami"
#: tokenprovider.cpp:255
msgid "Short Weekday Name"
-msgstr ""
+msgstr "Krótka nazwa dnia tygodnia"
#: tokenprovider.cpp:256
msgid "Full Weekday Name"
-msgstr ""
+msgstr "Pełna nazwa dnia tygodnia"
#: tokenprovider.cpp:257
msgid "Short Month Name"
-msgstr ""
+msgstr "Krótka nazwa miesiąca"
#: tokenprovider.cpp:258
msgid "Full Month Name"
-msgstr ""
+msgstr "Pełna nazwa miesiąca"
#: tokenprovider.cpp:259
-#, fuzzy
msgid "Date-Time"
-msgstr "Data"
+msgstr "Data i czas"
#: tokenprovider.cpp:260
-#, fuzzy
msgid "Century"
-msgstr "&Centruj"
+msgstr "Wiek"
#: tokenprovider.cpp:261
msgid "Day Number (01-31)"
-msgstr ""
+msgstr "Numer dnia (01-31)"
#: tokenprovider.cpp:262
msgid "Month-Day-year"
-msgstr ""
+msgstr "Miesiąc-Dzień-Rok"
#: tokenprovider.cpp:263
msgid "Day Number ( 1-31)"
-msgstr ""
+msgstr "Numer dnia (1-31)"
#: tokenprovider.cpp:264
msgid "Year-Month-day"
-msgstr ""
+msgstr "Rok-Miesiąc-Dzień"
#: tokenprovider.cpp:265
msgid "Week Year (yy)"
-msgstr ""
+msgstr "Tydzień roku (yy)"
#: tokenprovider.cpp:266
msgid "Week Year (yyyy)"
-msgstr ""
+msgstr "Tydzień roku (yyyy)"
#: tokenprovider.cpp:267
msgid "Hour (01-24)"
-msgstr ""
+msgstr "Godzina (01-24)"
#: tokenprovider.cpp:268
msgid "Hour (1-12)"
-msgstr ""
+msgstr "Godzina (1-12)"
#: tokenprovider.cpp:269
msgid "Day of Year"
-msgstr ""
+msgstr "Dzień roku"
#: tokenprovider.cpp:270
msgid "Month Number (01-12)"
-msgstr ""
+msgstr "Miesiąc (01-12)"
#: tokenprovider.cpp:271
msgid "Minute (00-59)"
-msgstr ""
+msgstr "Minuta (00-59)"
#: tokenprovider.cpp:272
msgid "a.m./p.m."
@@ -2547,77 +2459,77 @@ msgstr ""
#: tokenprovider.cpp:273
msgid "Time (h:m:s am/pm)"
-msgstr ""
+msgstr "Czas (h:m:s am/pm)"
#: tokenprovider.cpp:274
msgid "Time (HH:MM)"
-msgstr ""
+msgstr "Czas (HH:MM)"
#: tokenprovider.cpp:275
msgid "Seconds (00-59)"
-msgstr ""
+msgstr "Sekundy (00-59)"
#: tokenprovider.cpp:276
msgid "Time (HH:MM:SS)"
-msgstr ""
+msgstr "Czas (HH:MM:SS)"
#: tokenprovider.cpp:277
msgid "Weekday (1=Monday...)"
-msgstr ""
+msgstr "Numer dnia tygodnia (1=Poniedziałek...)"
#: tokenprovider.cpp:278 tokenprovider.cpp:281
msgid "Week Number (00-53)"
-msgstr ""
+msgstr "Numer tygodnia (00-53)"
#: tokenprovider.cpp:279
msgid "Week Number (01-53)"
-msgstr ""
+msgstr "Numer tygodnia (01-53)"
#: tokenprovider.cpp:280
msgid "Weekday (0=Sunday...)"
-msgstr ""
+msgstr "Numer dnia tygodnia (0=Niedziela...)"
#: tokenprovider.cpp:282
msgid "Local Date"
-msgstr ""
+msgstr "Data lokalna"
#: tokenprovider.cpp:283
msgid "Local Time"
-msgstr ""
+msgstr "Czas lokalny"
#: tokenprovider.cpp:284
msgid "Year (00-99)"
-msgstr ""
+msgstr "Rok (00-99)"
#: tokenprovider.cpp:285
msgid "Year (YYYY)"
-msgstr ""
+msgstr "Rok (YYYY)"
#: tokenprovider.cpp:286
msgid "Offset from UTC"
-msgstr ""
+msgstr "Przesunięcie od UTC"
#: tokenprovider.cpp:287
msgid "Timezone Name"
-msgstr ""
+msgstr "Nazwa strefy czasowej"
#: tokenprovider.cpp:292
msgid "Name"
-msgstr ""
+msgstr "Nazwa"
#: tokenprovider.cpp:296
msgid "Full E-Mail"
-msgstr ""
+msgstr "Pełny e-mail"
#: tokenprovider.cpp:319
msgid "Formatted Address"
-msgstr ""
+msgstr "Formatowany adres"
#: tokenprovider.cpp:825
msgid "ERROR: Empty SQL Query"
-msgstr ""
+msgstr "BŁĄD: Pusta kwerenda SQL"
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/translations/messages/ru.po b/translations/messages/ru.po
new file mode 100644
index 0000000..354890d
--- /dev/null
+++ b/translations/messages/ru.po
@@ -0,0 +1,2469 @@
+# SOME DESCRIPTIVE TITLE.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
+#, ignore-inconsistent
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
+#, ignore-inconsistent
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: barcodecombo.cpp:121
+msgid "&Encoding Type:"
+msgstr ""
+
+#: barcodecombo.cpp:130
+msgid "&Value:"
+msgstr ""
+
+#: barcodecombo.cpp:152
+msgid "&Display text"
+msgstr ""
+
+#: barcodecombo.cpp:157
+msgid "&Advanced..."
+msgstr ""
+
+#: barcodecombo.cpp:161 propertywidget.cpp:481
+msgid "&Insert Data Field..."
+msgstr ""
+
+#: barcodecombo.cpp:166
+msgid "&Margin:"
+msgstr ""
+
+#: barcodecombo.cpp:173 propertywidget.cpp:140 propertywidget.cpp:466
+msgid "&Rotation:"
+msgstr ""
+
+#: barcodecombo.cpp:180
+msgid "&Scale (in permille):"
+msgstr ""
+
+#: barcodecombo.cpp:187
+msgid "&Crop:"
+msgstr ""
+
+#: barcodedialog.cpp:46
+msgid "Barcode Generator"
+msgstr ""
+
+#: barcodedialog.cpp:57
+msgid "&Generate"
+msgstr ""
+
+#: barcodedialog.cpp:72
+msgid "&Print"
+msgstr ""
+
+#: barcodedialog.cpp:155
+msgid "An error occurred during saving the image"
+msgstr ""
+
+#: barcodedialogs.cpp:43
+msgid "Barcode Settings"
+msgstr ""
+
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:254
+msgid "PDF417"
+msgstr ""
+
+#: barcodedialogs.cpp:55
+msgid "DataMatrix"
+msgstr ""
+
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
+msgid "TBarcode"
+msgstr ""
+
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:476
+msgid "Barcode Writer in Pure Postscript"
+msgstr ""
+
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:440
+msgid "Colors"
+msgstr ""
+
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:362
+msgid "Sequence"
+msgstr ""
+
+#: barcodedialogs.cpp:116
+msgid "Module width (mm):"
+msgstr ""
+
+#: barcodedialogs.cpp:120
+msgid "Barcode Height (mm):"
+msgstr ""
+
+#: barcodedialogs.cpp:123
+msgid "&Translate escape sequences"
+msgstr ""
+
+#: barcodedialogs.cpp:124
+msgid "&Text above barcode"
+msgstr ""
+
+#: barcodedialogs.cpp:125
+msgid "&Auto correction"
+msgstr ""
+
+#: barcodedialogs.cpp:129
+msgid "&Checksum calculation method:"
+msgstr ""
+
+#: barcodedialogs.cpp:143
+msgid ""
+"<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
+"documentation for details. Normaly you do not want to change this value.</qt>"
+msgstr ""
+
+#: barcodedialogs.cpp:162
+msgid "No Checksum"
+msgstr ""
+
+#: barcodedialogs.cpp:163
+msgid "Default Checksum Method"
+msgstr ""
+
+#: barcodedialogs.cpp:167
+msgid "Modulo 10 Checksum"
+msgstr ""
+
+#: barcodedialogs.cpp:174
+msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
+msgstr ""
+
+#: barcodedialogs.cpp:177
+msgid "Modula 47 (2 digits)"
+msgstr ""
+
+#: barcodedialogs.cpp:180
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: barcodedialogs.cpp:183
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: barcodedialogs.cpp:186
+msgid "Code 11 (1 digit)"
+msgstr ""
+
+#: barcodedialogs.cpp:187
+msgid "Code 11 (2 digits)"
+msgstr ""
+
+#: barcodedialogs.cpp:191
+msgid "USPS Postnet"
+msgstr ""
+
+#: barcodedialogs.cpp:194
+msgid "MSI (1 digit)"
+msgstr ""
+
+#: barcodedialogs.cpp:195
+msgid "MSI (2 digits)"
+msgstr ""
+
+#: barcodedialogs.cpp:199 barkode.cpp:710
+msgid "Plessey"
+msgstr ""
+
+#: barcodedialogs.cpp:202
+msgid "EAN 8"
+msgstr ""
+
+#: barcodedialogs.cpp:205
+msgid "EAN 13"
+msgstr ""
+
+#: barcodedialogs.cpp:208
+msgid "UPC A"
+msgstr ""
+
+#: barcodedialogs.cpp:211
+msgid "UPC E"
+msgstr ""
+
+#: barcodedialogs.cpp:214
+msgid "EAN 128"
+msgstr ""
+
+#: barcodedialogs.cpp:217
+msgid "Code 128"
+msgstr ""
+
+#: barcodedialogs.cpp:220
+msgid "Royal Mail 4 State"
+msgstr ""
+
+#: barcodedialogs.cpp:262
+msgid "Rows:"
+msgstr ""
+
+#: barcodedialogs.cpp:266
+msgid "Columns:"
+msgstr ""
+
+#: barcodedialogs.cpp:270
+msgid "Error correction level:"
+msgstr ""
+
+#: barcodedialogs.cpp:310
+msgid "Data Matrix symbol sizes (rows x cols):"
+msgstr ""
+
+#: barcodedialogs.cpp:314
+msgid "Automatic calculation"
+msgstr ""
+
+#: barcodedialogs.cpp:368
+msgid "&Enable sequence"
+msgstr ""
+
+#: barcodedialogs.cpp:370
+msgid "Iterate over numbers 0-9"
+msgstr ""
+
+#: barcodedialogs.cpp:371
+msgid "Iterate over characters A-Z"
+msgstr ""
+
+#: barcodedialogs.cpp:372
+msgid "Iterate over A-Z, 0-9"
+msgstr ""
+
+#: barcodedialogs.cpp:375
+msgid "Step:"
+msgstr ""
+
+#: barcodedialogs.cpp:379
+msgid "Start:"
+msgstr ""
+
+#: barcodedialogs.cpp:451
+msgid "Bar Color:"
+msgstr ""
+
+#: barcodedialogs.cpp:452
+msgid "Background Color:"
+msgstr ""
+
+#: barcodedialogs.cpp:453
+msgid "Text Color:"
+msgstr ""
+
+#: barcodedialogs.cpp:479
+msgid "Enable &Checksum"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:31
+msgid "Barcode Printer"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:36
+msgid "&Output Format:"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:40
+msgid "&Print to File"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
+msgid "&Filename:"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:46
+msgid "&Device:"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:58
+msgid "TEC Printer (TEC)"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:59
+msgid "Zebra Printer (ZPL)"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:60
+msgid "Intermec Printer (IPL)"
+msgstr ""
+
+#: barcodeprinterdlg.cpp:61
+msgid "EPCL Printer (EPCL)"
+msgstr ""
+
+#: barkode.cpp:649
+msgid " [GNU Barcode]"
+msgstr ""
+
+#: barkode.cpp:652
+msgid " [PDF 417]"
+msgstr ""
+
+#: barkode.cpp:655
+msgid " [TBarcode]"
+msgstr ""
+
+#: barkode.cpp:658
+msgid " [TBarcode2]"
+msgstr ""
+
+#: barkode.cpp:661
+msgid " [Barcode Writer in Pure Postscript]"
+msgstr ""
+
+#: barkode.cpp:696
+msgid "Raw code 128"
+msgstr ""
+
+#: barkode.cpp:697
+msgid "Codabar"
+msgstr ""
+
+#: barkode.cpp:698
+msgid "Codabar (no checksum)"
+msgstr ""
+
+#: barkode.cpp:699
+msgid "Code 128 (a,b,c: autoselection)"
+msgstr ""
+
+#: barkode.cpp:700
+msgid "Code 128B, full printable ascii"
+msgstr ""
+
+#: barkode.cpp:701
+msgid "Code 128C (compact form digits)"
+msgstr ""
+
+#: barkode.cpp:702
+msgid "Code 39 (no checksum)"
+msgstr ""
+
+#: barkode.cpp:703
+msgid "Code 39"
+msgstr ""
+
+#: barkode.cpp:704
+msgid "Code 93"
+msgstr ""
+
+#: barkode.cpp:705
+msgid "EAN (EAN 8 or EAN 13)"
+msgstr ""
+
+#: barkode.cpp:706
+msgid "interleaved 2 of 5 (only digits, no checksum)"
+msgstr ""
+
+#: barkode.cpp:707
+msgid "interleaved 2 of 5 (only digits)"
+msgstr ""
+
+#: barkode.cpp:708
+msgid "ISBN (still EAN13)"
+msgstr ""
+
+#: barkode.cpp:709
+msgid "MSI"
+msgstr ""
+
+#: barkode.cpp:711
+msgid "UPC (12-digit EAN; UPCA and UPCB)"
+msgstr ""
+
+#: barkode.cpp:716
+msgid "pdf 417 2D Barcode"
+msgstr ""
+
+#: batchprinter.cpp:111 batchprinter.cpp:341
+msgid "Printing..."
+msgstr ""
+
+#: batchprinter.cpp:156 batchprinter.cpp:157 batchprinter.cpp:158
+#: batchprinter.cpp:159
+msgid "Group : "
+msgstr ""
+
+#: batchprinter.cpp:161 batchprinter.cpp:162 batchprinter.cpp:163
+#: batchprinter.cpp:164
+msgid "Article No. : "
+msgstr ""
+
+#: batchprinter.cpp:273
+msgid "Creating Images..."
+msgstr ""
+
+#: batchprinter.cpp:337
+msgid "<qt>Can't open the file or device <b>%1</b></qt>."
+msgstr ""
+
+#: batchwizard.cpp:117
+msgid ""
+"<qt>This wizard will guide you through the process of printing many labels "
+"with KBarcode.<br>The first step is to select the KBarcode label file you "
+"want to print.</qt>"
+msgstr ""
+
+#: batchwizard.cpp:135
+msgid "File Selection"
+msgstr ""
+
+#: batchwizard.cpp:147
+msgid "Print &labels without data"
+msgstr ""
+
+#: batchwizard.cpp:148
+msgid "Print &articles from KBarcodes SQL database"
+msgstr ""
+
+#: batchwizard.cpp:149
+msgid "Import &variables and print"
+msgstr ""
+
+#: batchwizard.cpp:150
+msgid "Print &contacts from your addressbook"
+msgstr ""
+
+#: batchwizard.cpp:162
+msgid "Data Source"
+msgstr ""
+
+#: batchwizard.cpp:174
+msgid "Print Data"
+msgstr ""
+
+#: batchwizard.cpp:185
+msgid "Insert Row"
+msgstr ""
+
+#: batchwizard.cpp:187
+msgid "Delete Row"
+msgstr ""
+
+#: batchwizard.cpp:194
+msgid "Import Variables"
+msgstr ""
+
+#: batchwizard.cpp:206
+msgid ""
+"<qt>KBarcode has support for placing serial numbers on labels. If you did "
+"not use the [serial] token on your label in a text field or a barcode, you "
+"can skip this page.<br>Serial start is a free form start value containing at "
+"least one number. This number is increased for every printed label on the "
+"print out.</qt>"
+msgstr ""
+
+#: batchwizard.cpp:216 previewdialog.cpp:104
+msgid "Serial start:"
+msgstr ""
+
+#: batchwizard.cpp:220 previewdialog.cpp:106
+msgid "Serial increment:"
+msgstr ""
+
+#: batchwizard.cpp:223
+msgid "Serial Number"
+msgstr ""
+
+#: batchwizard.cpp:233
+msgid "&Print to a system printer or to a file"
+msgstr ""
+
+#: batchwizard.cpp:234
+msgid "&Create images"
+msgstr ""
+
+#: batchwizard.cpp:239
+msgid "Print to a special &barcode printer"
+msgstr ""
+
+#: batchwizard.cpp:243
+msgid "Output &Directory:"
+msgstr ""
+
+#: batchwizard.cpp:249
+msgid "Output File &Format:"
+msgstr ""
+
+#: batchwizard.cpp:259
+msgid "Use &article number for filename"
+msgstr ""
+
+#: batchwizard.cpp:260
+msgid "Use &barcode number for filename"
+msgstr ""
+
+#: batchwizard.cpp:261
+msgid "Use &custom filename:"
+msgstr ""
+
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
+msgid "Output Device"
+msgstr ""
+
+#: batchwizard.cpp:298
+msgid "Customer name and no.:"
+msgstr ""
+
+#: batchwizard.cpp:305
+msgid "&Add..."
+msgstr ""
+
+#: batchwizard.cpp:306
+msgid "&Import..."
+msgstr ""
+
+#: batchwizard.cpp:307
+msgid "&Edit..."
+msgstr ""
+
+#: batchwizard.cpp:309
+msgid "R&emove All"
+msgstr ""
+
+#: batchwizard.cpp:312
+msgid "Import from File ..."
+msgstr ""
+
+#: batchwizard.cpp:313
+msgid "Import from Clipboard ..."
+msgstr ""
+
+#: batchwizard.cpp:314
+msgid "Import barcode_basic"
+msgstr ""
+
+#: batchwizard.cpp:318
+msgid "Index"
+msgstr ""
+
+#: batchwizard.cpp:319
+msgid "Number of Labels"
+msgstr ""
+
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
+msgid "Article Number"
+msgstr ""
+
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
+msgid "Group"
+msgstr ""
+
+#: batchwizard.cpp:343
+msgid "Enter &data manually"
+msgstr ""
+
+#: batchwizard.cpp:344
+msgid "Import variables from a &SQL table"
+msgstr ""
+
+#: batchwizard.cpp:345
+msgid "Please enter a sql &query:"
+msgstr ""
+
+#: batchwizard.cpp:349
+msgid "Import from a &CSV file"
+msgstr ""
+
+#: batchwizard.cpp:350
+msgid "Please select a csv &file:"
+msgstr ""
+
+#: batchwizard.cpp:353
+msgid "&Encoding:"
+msgstr ""
+
+#: batchwizard.cpp:362
+msgid "Available Variables:"
+msgstr ""
+
+#: batchwizard.cpp:380
+msgid "&Number of labels to print:"
+msgstr ""
+
+#: batchwizard.cpp:411
+msgid "Add all contacts to the list of contacts which will be printed."
+msgstr ""
+
+#: batchwizard.cpp:412
+msgid "Add selected contacts to the list of contacts which will be printed."
+msgstr ""
+
+#: batchwizard.cpp:413
+msgid ""
+"Remove selected contacts from the list of contacts which will be printed."
+msgstr ""
+
+#: batchwizard.cpp:414
+msgid "Remove all contacts from the list of contacts which will be printed."
+msgstr ""
+
+#: batchwizard.cpp:430
+msgid "All Addresses"
+msgstr ""
+
+#: batchwizard.cpp:431
+msgid "Selected Addresses"
+msgstr ""
+
+#: batchwizard.cpp:434 batchwizard.cpp:445
+msgid "Given Name"
+msgstr ""
+
+#: batchwizard.cpp:435 batchwizard.cpp:446
+msgid "Family Name"
+msgstr ""
+
+#: batchwizard.cpp:436 batchwizard.cpp:447
+msgid "Email Address"
+msgstr ""
+
+#: batchwizard.cpp:561
+msgid "The label file %1 was not found"
+msgstr ""
+
+#: batchwizard.cpp:743
+msgid "Please enter a valid article ID"
+msgstr ""
+
+#: batchwizard.cpp:901
+msgid "Separator is empty. Please set it to a value."
+msgstr ""
+
+#: batchwizard.cpp:971
+msgid "<qt>The following items can not be added:"
+msgstr ""
+
+#: batchwizard.cpp:1051
+msgid "<qt>Can't execute SQL query:<br>"
+msgstr ""
+
+#: batchwizard.cpp:1078
+#, c-format
+msgid "Can't open file: %1"
+msgstr ""
+
+#: commands.cpp:434
+msgid "New Rectangle"
+msgstr ""
+
+#: commands.cpp:448
+msgid "New Line"
+msgstr ""
+
+#: commands.cpp:458
+msgid "New Text"
+msgstr ""
+
+#: commands.cpp:475
+msgid "New TextLine"
+msgstr ""
+
+#: commands.cpp:492
+msgid "New Barcode"
+msgstr ""
+
+#: commands.h:142
+msgid "Resized Item"
+msgstr ""
+
+#: commands.h:170
+msgid "Moved Item"
+msgstr ""
+
+#: commands.h:185
+msgid "Raised or lowered an item"
+msgstr ""
+
+#: commands.h:203 labeleditor.cpp:736
+msgid "Protected Item"
+msgstr ""
+
+#: commands.h:221
+msgid "Changed Settings"
+msgstr ""
+
+#: commands.h:244 commands.h:276
+msgid "Changed Text"
+msgstr ""
+
+#: commands.h:258
+msgid "Rotated Text"
+msgstr ""
+
+#: commands.h:297
+msgid "Changed Barcode"
+msgstr ""
+
+#: commands.h:308
+msgid "New Picture"
+msgstr ""
+
+#: commands.h:377
+msgid "Delete Item"
+msgstr ""
+
+#: commands.h:388
+msgid "Modified Border"
+msgstr ""
+
+#: commands.h:407
+msgid "Modified Rectangle or Ellipse"
+msgstr ""
+
+#: commands.h:427
+msgid "Changed visibility JavaScript"
+msgstr ""
+
+#: configdialog.cpp:46
+msgid "There are currently %1 cached barcodes."
+msgstr ""
+
+#: configdialog.cpp:50 confwizard.cpp:59
+msgid "Configure KBarcode"
+msgstr ""
+
+#: configdialog.cpp:66
+msgid "SQL Settings"
+msgstr ""
+
+#: configdialog.cpp:80
+msgid "Print Settings"
+msgstr ""
+
+#: configdialog.cpp:88
+msgid "Medium Resolution (300dpi)"
+msgstr ""
+
+#: configdialog.cpp:89
+msgid "High Resolution (600dpi)"
+msgstr ""
+
+#: configdialog.cpp:90
+msgid "Very High Resolution (1200dpi)"
+msgstr ""
+
+#: configdialog.cpp:110
+msgid "Printer Resolution:"
+msgstr ""
+
+#: configdialog.cpp:112
+msgid "Preview Page Format:"
+msgstr ""
+
+#: configdialog.cpp:127 csvimportdlg.cpp:175
+msgid "Comment:"
+msgstr ""
+
+#: configdialog.cpp:134 csvimportdlg.cpp:182
+msgid "Separator:"
+msgstr ""
+
+#: configdialog.cpp:141 csvimportdlg.cpp:189
+msgid "Quote Character:"
+msgstr ""
+
+#: configdialog.cpp:147
+msgid "&Use customer article no. for import"
+msgstr ""
+
+#: configdialog.cpp:153 csvimportdlg.cpp:156
+msgid "File Format:"
+msgstr ""
+
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
+msgid "Quantity"
+msgstr ""
+
+#: configdialog.cpp:186
+msgid "Label Editor"
+msgstr ""
+
+#: configdialog.cpp:190
+msgid "&Create a new label on startup"
+msgstr ""
+
+#: configdialog.cpp:198
+msgid "Grid:"
+msgstr ""
+
+#: configdialog.cpp:205
+msgid "Grid Color:"
+msgstr ""
+
+#: configdialog.cpp:207
+msgid "Date Format:"
+msgstr ""
+
+#: configdialog.cpp:215
+msgid "On New"
+msgstr ""
+
+#: configdialog.cpp:219
+msgid "On New Article"
+msgstr ""
+
+#: configdialog.cpp:226 configdialog.cpp:232
+msgid "No Line Break"
+msgstr ""
+
+#: configdialog.cpp:227 configdialog.cpp:233
+msgid "Line Break"
+msgstr ""
+
+#: configdialog.cpp:228 configdialog.cpp:234
+msgid "Insert Label X"
+msgstr ""
+
+#: configdialog.cpp:229 configdialog.cpp:235
+msgid "New Page"
+msgstr ""
+
+#: configdialog.cpp:230
+msgid "Article No."
+msgstr ""
+
+#: configdialog.cpp:236
+msgid "Group Name"
+msgstr ""
+
+#: configdialog.cpp:260
+msgid "On New Group"
+msgstr ""
+
+#: configdialog.cpp:348
+msgid "Preview: "
+msgstr ""
+
+#: confwizard.cpp:45
+msgid ""
+"KBarcode is a barcode and label printing application for TDE. It can be used "
+"to print every thing from simple business cards up to complex labels with "
+"several barcodes (e.g. article descriptions). KBarcode comes with an easy to "
+"use WYSIWYG label designer, a setup wizard, batch import of labels (directly "
+"from the delivery note), thousands of predefined labels, database management "
+"tools and translations in many languages. Even printing more than 10.000 "
+"labels in one go is no problem for KBarcode. Additionally it is a simply "
+"xbarcode replacement for the creation of barcodes. All major types of "
+"barcodes like EAN, UPC, CODE39 and ISBN are supported."
+msgstr ""
+
+#: confwizard.cpp:101
+msgid "<qt><h1>Welcome to KBarcode</h1><br><br>"
+msgstr ""
+
+#: confwizard.cpp:111
+msgid "Welcome"
+msgstr ""
+
+#: confwizard.cpp:124
+msgid "System Check"
+msgstr ""
+
+#: confwizard.cpp:133
+msgid "&Use database with KBarcode"
+msgstr ""
+
+#: confwizard.cpp:144 tokenprovider.cpp:207
+msgid "Database"
+msgstr ""
+
+#: confwizard.cpp:153
+msgid ""
+"KBarcode can create the required SQL tables for you.<br>KBarcode will add "
+"also some Label Definitions to the tables.<br>After that you can fill the "
+"tables with some example data."
+msgstr ""
+
+#: confwizard.cpp:160 dsmainwindow.cpp:78
+msgid "&Create Tables"
+msgstr ""
+
+#: confwizard.cpp:165
+msgid "&Add Example Data"
+msgstr ""
+
+#: confwizard.cpp:170
+msgid "Create Tables"
+msgstr ""
+
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:474
+msgid "<qt>Connection failed:<br>"
+msgstr ""
+
+#: confwizard.cpp:225
+msgid "Example data has been imported."
+msgstr ""
+
+#: confwizard.cpp:236
+msgid ""
+"There are no TQt SQL drivers installed. KBarcode needs those drivers to "
+"access the different SQL databases. This drivers are part of the TQt Source "
+"distribution and should also be part of your distribution. Please install "
+"them first."
+msgstr ""
+
+#: csvimportdlg.cpp:61
+msgid "&Import"
+msgstr ""
+
+#: csvimportdlg.cpp:61
+msgid "Import the selected file into your tables."
+msgstr ""
+
+#: csvimportdlg.cpp:93
+msgid "&Import Data"
+msgstr ""
+
+#: csvimportdlg.cpp:104
+msgid "Other table..."
+msgstr ""
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
+msgid "Column:"
+msgstr ""
+
+#: csvimportdlg.cpp:124
+msgid "Set"
+msgstr ""
+
+#: csvimportdlg.cpp:127
+msgid "Database field to use for this column:"
+msgstr ""
+
+#: csvimportdlg.cpp:131
+msgid "File to import:"
+msgstr ""
+
+#: csvimportdlg.cpp:133
+msgid "Encoding:"
+msgstr ""
+
+#: csvimportdlg.cpp:135
+msgid "Import into table:"
+msgstr ""
+
+#: csvimportdlg.cpp:137
+msgid "Table Name:"
+msgstr ""
+
+#: csvimportdlg.cpp:151
+msgid "&Import Settings"
+msgstr ""
+
+#: csvimportdlg.cpp:157
+msgid "&CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+msgid "&Remove Field"
+msgstr ""
+
+#: csvimportdlg.cpp:356
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:377
+msgid "Could not import the following line:"
+msgstr ""
+
+#: csvimportdlg.cpp:382
+msgid "Data was imported successfully."
+msgstr ""
+
+#: databasebrowser.cpp:46
+msgid "Current Table: <b>"
+msgstr ""
+
+#: databasebrowser.cpp:98 kbarcode.cpp:87
+msgid "&Import CSV File..."
+msgstr ""
+
+#: definition.cpp:547
+msgid ""
+"KBarcode is unable to find its label definitions.Please make sure that the "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"is part of the KBarcode distribution. You will be prompted now to select the "
+"file containing the labeldefinitions."
+msgstr ""
+
+#: definitiondialog.cpp:82
+msgid "Add Label Definition"
+msgstr ""
+
+#: definitiondialog.cpp:91 newlabel.cpp:64
+msgid "Producer:"
+msgstr ""
+
+#: definitiondialog.cpp:95 newlabel.cpp:67
+msgid "Type:"
+msgstr ""
+
+#: definitiondialog.cpp:99
+msgid "Width (in %1):"
+msgstr ""
+
+#: definitiondialog.cpp:103
+msgid "Height (in %1):"
+msgstr ""
+
+#: definitiondialog.cpp:107
+msgid "Horizontal Gap:"
+msgstr ""
+
+#: definitiondialog.cpp:111
+msgid "Vertical Gap:"
+msgstr ""
+
+#: definitiondialog.cpp:115
+msgid "Top Gap:"
+msgstr ""
+
+#: definitiondialog.cpp:119
+msgid "Left Gap:"
+msgstr ""
+
+#: definitiondialog.cpp:123
+msgid "Number Horizontal:"
+msgstr ""
+
+#: definitiondialog.cpp:127
+msgid "Number Vertical:"
+msgstr ""
+
+#: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
+#: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
+msgid "0"
+msgstr ""
+
+#: definitiondialog.cpp:143 definitiondialog.cpp:148 definitiondialog.cpp:153
+#: definitiondialog.cpp:158 definitiondialog.cpp:163 definitiondialog.cpp:168
+msgid "0123456789."
+msgstr ""
+
+#: definitiondialog.cpp:189
+msgid "More &Information"
+msgstr ""
+
+#: definitiondialog.cpp:196 smalldialogs.cpp:97
+msgid "&Add"
+msgstr ""
+
+#: definitiondialog.cpp:263 printersettings.cpp:45
+msgid "Custom"
+msgstr ""
+
+#: definitiondialog.cpp:398
+msgid "Number of horizontal Labels"
+msgstr ""
+
+#: definitiondialog.cpp:400
+msgid "Number of vertical Labels"
+msgstr ""
+
+#: definitiondialog.cpp:404
+msgid "Gap Top"
+msgstr ""
+
+#: definitiondialog.cpp:406
+msgid "Gap Left"
+msgstr ""
+
+#: definitiondialog.cpp:411
+msgid "Vertical Gap"
+msgstr ""
+
+#: definitiondialog.cpp:412
+msgid "Horizontal Gap"
+msgstr ""
+
+#: documentitemdlg.cpp:33
+msgid "&Position && Size"
+msgstr ""
+
+#: documentitemdlg.cpp:36
+msgid "&Border"
+msgstr ""
+
+#: documentitemdlg.cpp:41
+msgid "&Fill Color"
+msgstr ""
+
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
+msgid "&Barcode"
+msgstr ""
+
+#: documentitemdlg.cpp:51
+msgid "&Rotation"
+msgstr ""
+
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
+msgid "&Text"
+msgstr ""
+
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
+msgid "&Image"
+msgstr ""
+
+#: documentitemdlg.cpp:77
+msgid "&Visibility"
+msgstr ""
+
+#: documentitemdlg.cpp:108
+msgid "Property changed"
+msgstr ""
+
+#: dsmainwindow.cpp:71
+msgid "&Start Configuration Wizard..."
+msgstr ""
+
+#: dsmainwindow.cpp:74
+msgid "&Connect to Database"
+msgstr ""
+
+#: dsmainwindow.cpp:81
+msgid "&Import Label Definitions"
+msgstr ""
+
+#: dsmainwindow.cpp:84
+msgid "&Import Example Data"
+msgstr ""
+
+#: dsmainwindow.cpp:94
+msgid "&Barcode Help..."
+msgstr ""
+
+#: dsmainwindow.cpp:96
+msgid "&Donate..."
+msgstr ""
+
+#: dsmainwindow.cpp:98
+msgid "&System Check..."
+msgstr ""
+
+#: dsmainwindow.cpp:180
+msgid ""
+"<qt>The KBarcode documentation is avaible as PDF for download here.<br><br>"
+msgstr ""
+
+#: dsmainwindow.cpp:182
+msgid "Download Now"
+msgstr ""
+
+#: dsmainwindow.cpp:211
+msgid ""
+"<qt>It is possible to support the further development of KBarcode through "
+"donations.<br><br>"
+msgstr ""
+
+#: dsmainwindow.cpp:213
+msgid "Donate Now"
+msgstr ""
+
+#: dsmainwindow.cpp:226
+msgid "<p><h3>Barcode Support</h3></p>"
+msgstr ""
+
+#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
+#: dsmainwindow.cpp:234 dsmainwindow.cpp:236
+msgid "<b>No</b><br />"
+msgstr ""
+
+#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
+#: dsmainwindow.cpp:234 dsmainwindow.cpp:236
+msgid "<b>Found</b><br />"
+msgstr ""
+
+#: dsmainwindow.cpp:239
+msgid ""
+"<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</i>, "
+"<i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
+msgstr ""
+
+#: dsmainwindow.cpp:241
+msgid "<p><h3>Database Support</h3></p>"
+msgstr ""
+
+#: dsmainwindow.cpp:249
+msgid "<li>Driver found: "
+msgstr ""
+
+#: dsmainwindow.cpp:254
+msgid ""
+"<p><b>No database drivers found. SQL database support is disabled.</b></p>"
+msgstr ""
+
+#: imageitem.cpp:267
+msgid "Expression: "
+msgstr ""
+
+#: kbarcode.cpp:51
+msgid "Barcode &Generator..."
+msgstr ""
+
+#: kbarcode.cpp:53
+msgid "&Label Editor..."
+msgstr ""
+
+#: kbarcode.cpp:54
+msgid "&Batch Printing..."
+msgstr ""
+
+#: kbarcode.cpp:55
+msgid "Edit SQL &Tables..."
+msgstr ""
+
+#: kbarcode.cpp:75
+msgid "&Edit Label Definitions"
+msgstr ""
+
+#: kbarcode.cpp:78
+msgid "&Edit Articles"
+msgstr ""
+
+#: kbarcode.cpp:81
+msgid "&Edit Customers"
+msgstr ""
+
+#: kbarcode.cpp:84
+msgid "&Edit Customer Text"
+msgstr ""
+
+#: kbarcode.cpp:179
+msgid ""
+"%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
+"IMAGE and BARCODE."
+msgstr ""
+
+#: label.cpp:197
+msgid "Static"
+msgstr ""
+
+#: labeleditor.cpp:348
+msgid "Select Label"
+msgstr ""
+
+#: labeleditor.cpp:385
+msgid ""
+"<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
+"qt>"
+msgstr ""
+
+#: labeleditor.cpp:444
+msgid "Close &Label"
+msgstr ""
+
+#: labeleditor.cpp:446
+msgid "&Recent Files"
+msgstr ""
+
+#: labeleditor.cpp:448
+msgid "&Import and Print Batch File..."
+msgstr ""
+
+#: labeleditor.cpp:452
+msgid "&Change description..."
+msgstr ""
+
+#: labeleditor.cpp:453
+msgid "&Delete Object"
+msgstr ""
+
+#: labeleditor.cpp:456
+msgid "Print to &Barcode Printer..."
+msgstr ""
+
+#: labeleditor.cpp:457
+msgid "Print to &Image..."
+msgstr ""
+
+#: labeleditor.cpp:458
+msgid "&Change Label..."
+msgstr ""
+
+#: labeleditor.cpp:459
+msgid "Insert &Barcode"
+msgstr ""
+
+#: labeleditor.cpp:462
+msgid "Insert &Picture"
+msgstr ""
+
+#: labeleditor.cpp:463
+msgid "Insert &Text"
+msgstr ""
+
+#: labeleditor.cpp:464 multilineeditdlg.cpp:137 textlineedit.cpp:90
+msgid "Insert &Data Field"
+msgstr ""
+
+#: labeleditor.cpp:465
+msgid "Insert &Text Line"
+msgstr ""
+
+#: labeleditor.cpp:466
+msgid "Insert &Line"
+msgstr ""
+
+#: labeleditor.cpp:467
+msgid "Insert &Rectangle"
+msgstr ""
+
+#: labeleditor.cpp:468
+msgid "Insert &Ellipse"
+msgstr ""
+
+#: labeleditor.cpp:470
+msgid "&Grid"
+msgstr ""
+
+#: labeleditor.cpp:471
+msgid "&Preview..."
+msgstr ""
+
+#: labeleditor.cpp:478
+msgid "Address&book"
+msgstr ""
+
+#: labeleditor.cpp:479
+msgid "&Create Single Barcode..."
+msgstr ""
+
+#: labeleditor.cpp:522
+msgid "T&ools"
+msgstr ""
+
+#: labeleditor.cpp:582
+msgid "&On Top"
+msgstr ""
+
+#: labeleditor.cpp:583
+msgid "&Raise"
+msgstr ""
+
+#: labeleditor.cpp:584
+msgid "&Lower"
+msgstr ""
+
+#: labeleditor.cpp:585
+msgid "&To Background"
+msgstr ""
+
+#: labeleditor.cpp:588
+msgid "Center &Horizontally"
+msgstr ""
+
+#: labeleditor.cpp:589
+msgid "Center &Vertically"
+msgstr ""
+
+#: labeleditor.cpp:591
+msgid "&Order"
+msgstr ""
+
+#: labeleditor.cpp:592
+msgid "&Center"
+msgstr ""
+
+#: labeleditor.cpp:595
+msgid "&Protect Position and Size"
+msgstr ""
+
+#: labeleditor.cpp:597
+msgid "&Properties"
+msgstr ""
+
+#: labeleditor.cpp:672
+msgid "Label Description"
+msgstr ""
+
+#: labeleditor.cpp:673
+msgid "Please enter a description:"
+msgstr ""
+
+#: labeleditor.cpp:702
+msgid "Size: "
+msgstr ""
+
+#: labeleditor.cpp:705
+msgid "Label Template: "
+msgstr ""
+
+#: labeleditor.cpp:835
+msgid "Spellchecking"
+msgstr ""
+
+#: labeleditor.cpp:1005
+msgid "The file %1 does not exist."
+msgstr ""
+
+#: labeleditor.cpp:1040
+msgid ""
+"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
+msgstr ""
+
+#: main.cpp:35
+msgid ""
+"Load the file in KBarcode (if --batch is specified, the file will be used in "
+"batchprinting mode)"
+msgstr ""
+
+#: main.cpp:36
+msgid ""
+"Print any loaded files immediately on the default printer or on the printer "
+"specified by the --printer commandline option and exit afterwards"
+msgstr ""
+
+#: main.cpp:38
+msgid "Printer/destination to print on"
+msgstr ""
+
+#: main.cpp:39
+msgid "KBarcode Modes:"
+msgstr ""
+
+#: main.cpp:40
+msgid "Start KBarcode as xbarcode replacement"
+msgstr ""
+
+#: main.cpp:41
+msgid "Open the label editor"
+msgstr ""
+
+#: main.cpp:42
+msgid "Start directly in batchprinting mode"
+msgstr ""
+
+#: main.cpp:43
+msgid "Additional options for batchprinting (--batch):"
+msgstr ""
+
+#: main.cpp:44
+msgid "Output format where mode is one of POSTSCRIPT|IMAGE|BARCODE"
+msgstr ""
+
+#: main.cpp:45
+msgid "Set the serial number to be used"
+msgstr ""
+
+#: main.cpp:46
+msgid ""
+"Increase a previously specified serial number using this value for each "
+"printed label"
+msgstr ""
+
+#: main.cpp:47
+msgid "Print <value> labels without any data"
+msgstr ""
+
+#: main.cpp:48
+msgid "Import variable data from a specified sql query"
+msgstr ""
+
+#: main.cpp:49
+msgid "Import variable data from a specified csv file"
+msgstr ""
+
+#: main.cpp:84
+msgid "KBarcode"
+msgstr ""
+
+#: main.cpp:85
+msgid "KBarcode is a barcode and label printing application for TDE."
+msgstr ""
+
+#: main.cpp:88
+msgid "Programmer"
+msgstr ""
+
+#: main.cpp:90
+msgid "Project Manager"
+msgstr ""
+
+#: main.cpp:93
+msgid "Wrote GNU Barcode on which kbarcode is based."
+msgstr ""
+
+#: main.cpp:95
+msgid "Author of Barcode Writer in Pure Postscript"
+msgstr ""
+
+#: main.cpp:97
+msgid "Italian translation"
+msgstr ""
+
+#: main.cpp:99
+msgid "Finnish and Swedish translation, created the KBarcode icon"
+msgstr ""
+
+#: main.cpp:100
+msgid "Spanish translation"
+msgstr ""
+
+#: main.cpp:101
+msgid "Hungarian translation"
+msgstr ""
+
+#: main.cpp:103
+msgid "Tab icon code stolen from his excellent app qtella."
+msgstr ""
+
+#: main.cpp:104
+msgid "Wrote the RichText KPart"
+msgstr ""
+
+#: main.cpp:105
+msgid "French Translation"
+msgstr ""
+
+#: main.cpp:106
+msgid "Help with ZPL and IPL code"
+msgstr ""
+
+#: main.cpp:107
+msgid "Wrote many patches to improve KBarcode"
+msgstr ""
+
+#: main.cpp:108
+msgid "Made the Netherlands translation"
+msgstr ""
+
+#: main.cpp:109
+msgid "Added lot's of useful data fields to kbarcode"
+msgstr ""
+
+#: main.cpp:110
+msgid "Added TEC barcode printer support"
+msgstr ""
+
+#: main.cpp:111
+msgid "Added EPCL barcode printer support"
+msgstr ""
+
+#: main.cpp:112
+msgid "Wrote bugfixes."
+msgstr ""
+
+#: main.cpp:113
+msgid "Maintainer (TDE project)"
+msgstr ""
+
+#: measurements.cpp:51
+msgid "mm"
+msgstr ""
+
+#: measurements.cpp:52
+msgid "in"
+msgstr ""
+
+#: mimesources.cpp:33
+msgid "Pasted Object"
+msgstr ""
+
+#: multilineeditdlg.cpp:95
+msgid "&Bold"
+msgstr ""
+
+#: multilineeditdlg.cpp:98
+msgid "&Italic"
+msgstr ""
+
+#: multilineeditdlg.cpp:101
+msgid "&Underline"
+msgstr ""
+
+#: multilineeditdlg.cpp:104
+msgid "Text &Color..."
+msgstr ""
+
+#: multilineeditdlg.cpp:109
+msgid "&Font"
+msgstr ""
+
+#: multilineeditdlg.cpp:112
+msgid "Font &Size"
+msgstr ""
+
+#: multilineeditdlg.cpp:118
+msgid "Align &Left"
+msgstr ""
+
+#: multilineeditdlg.cpp:121
+msgid "Align &Center"
+msgstr ""
+
+#: multilineeditdlg.cpp:124
+msgid "Align &Right"
+msgstr ""
+
+#: multilineeditdlg.cpp:127
+msgid "&Justify"
+msgstr ""
+
+#: mycanvasview.cpp:152
+msgid "Position: "
+msgstr ""
+
+#: mycanvasview.cpp:281
+msgid "Item Moved"
+msgstr ""
+
+#: newlabel.cpp:41
+msgid "New Label"
+msgstr ""
+
+#: newlabel.cpp:49
+msgid "<h1>Create a new Label</h1><br><br>"
+msgstr ""
+
+#: newlabel.cpp:51
+msgid "<h1>Change Label Size</h1><br><br>"
+msgstr ""
+
+#: newlabel.cpp:56 tokenprovider.cpp:208
+msgid "Label"
+msgstr ""
+
+#: newlabel.cpp:72
+msgid "&Start with an empty label"
+msgstr ""
+
+#: newlabel.cpp:102
+msgid "&Add own Label Definition"
+msgstr ""
+
+#: newlabel.cpp:168
+msgid ""
+"<b>Format:</b><br>\n"
+"Width: "
+msgstr ""
+
+#: newlabel.cpp:169
+msgid "%1<br>Height: "
+msgstr ""
+
+#: newlabel.cpp:170
+msgid "%2<br>Horizontal Gap: "
+msgstr ""
+
+#: newlabel.cpp:171
+msgid "%3<br>Vertical Gap: "
+msgstr ""
+
+#: newlabel.cpp:172
+msgid "%4<br>Top Gap: "
+msgstr ""
+
+#: newlabel.cpp:173
+msgid "%5<br>Left Gap: "
+msgstr ""
+
+#: newlabel.cpp:192
+msgid "No label selected."
+msgstr ""
+
+#: previewdialog.cpp:89
+msgid "Select &Address"
+msgstr ""
+
+#: previewdialog.cpp:95
+msgid "Customer Name and No.:"
+msgstr ""
+
+#: previewdialog.cpp:98
+msgid "Article Number:"
+msgstr ""
+
+#: previewdialog.cpp:100 smalldialogs.cpp:45 smalldialogs.cpp:94
+msgid "Group:"
+msgstr ""
+
+#: previewdialog.cpp:102
+msgid "Index:"
+msgstr ""
+
+#: previewdialog.cpp:108
+msgid "Addressbook entry:"
+msgstr ""
+
+#: printersettings.cpp:39
+msgid "ISO A3"
+msgstr ""
+
+#: printersettings.cpp:40
+msgid "ISO A4"
+msgstr ""
+
+#: printersettings.cpp:41
+msgid "ISO A5"
+msgstr ""
+
+#: printersettings.cpp:42
+msgid "US Letter"
+msgstr ""
+
+#: printersettings.cpp:43
+msgid "US Legal"
+msgstr ""
+
+#: printersettings.cpp:44
+msgid "Screen"
+msgstr ""
+
+#: printersettings.cpp:46
+msgid "ISO B5"
+msgstr ""
+
+#: printersettings.cpp:47
+msgid "US Executive"
+msgstr ""
+
+#: printersettings.cpp:48
+msgid "ISO A0"
+msgstr ""
+
+#: printersettings.cpp:49
+msgid "ISO A1"
+msgstr ""
+
+#: printersettings.cpp:50
+msgid "ISO A2"
+msgstr ""
+
+#: printersettings.cpp:51
+msgid "ISO A6"
+msgstr ""
+
+#: printersettings.cpp:52
+msgid "ISO A7"
+msgstr ""
+
+#: printersettings.cpp:53
+msgid "ISO A8"
+msgstr ""
+
+#: printersettings.cpp:54
+msgid "ISO A9"
+msgstr ""
+
+#: printersettings.cpp:55
+msgid "ISO B0"
+msgstr ""
+
+#: printersettings.cpp:56
+msgid "ISO B1"
+msgstr ""
+
+#: printersettings.cpp:57
+msgid "ISO B10"
+msgstr ""
+
+#: printersettings.cpp:58
+msgid "ISO B2"
+msgstr ""
+
+#: printersettings.cpp:59
+msgid "ISO B3"
+msgstr ""
+
+#: printersettings.cpp:60
+msgid "ISO B4"
+msgstr ""
+
+#: printersettings.cpp:61
+msgid "ISO B6"
+msgstr ""
+
+#: printersettings.cpp:62
+msgid "ISO C5"
+msgstr ""
+
+#: printersettings.cpp:63
+msgid "US Common 10"
+msgstr ""
+
+#: printersettings.cpp:64
+msgid "ISO DL"
+msgstr ""
+
+#: printersettings.cpp:65
+msgid "US Folio"
+msgstr ""
+
+#: printersettings.cpp:66
+msgid "US Ledger"
+msgstr ""
+
+#: printersettings.cpp:67
+msgid "US Tabloid"
+msgstr ""
+
+#: printlabeldlg.cpp:36 smalldialogs.cpp:42 smalldialogs.cpp:88
+msgid "Number of labels:"
+msgstr ""
+
+#: printlabeldlg.cpp:40
+msgid "Start at label position:"
+msgstr ""
+
+#: printlabeldlg.cpp:43
+msgid "&Print crop marks (borders)"
+msgstr ""
+
+#: propertywidget.cpp:90
+msgid "&Border Visible"
+msgstr ""
+
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
+msgid "Color:"
+msgstr ""
+
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
+msgid "Line Width:"
+msgstr ""
+
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+msgid "Line Style:"
+msgstr ""
+
+#: propertywidget.cpp:145 propertywidget.cpp:485
+msgid "90"
+msgstr ""
+
+#: propertywidget.cpp:146 propertywidget.cpp:486
+msgid "180"
+msgstr ""
+
+#: propertywidget.cpp:147 propertywidget.cpp:487
+msgid "270"
+msgstr ""
+
+#: propertywidget.cpp:212
+msgid "Barcode Settings:"
+msgstr ""
+
+#: propertywidget.cpp:346
+msgid "&Protect item from being moved or resized"
+msgstr ""
+
+#: propertywidget.cpp:357
+msgid "&Top:"
+msgstr ""
+
+#: propertywidget.cpp:358
+msgid "&Left:"
+msgstr ""
+
+#: propertywidget.cpp:359
+msgid "&Height:"
+msgstr ""
+
+#: propertywidget.cpp:360
+msgid "&Width:"
+msgstr ""
+
+#: propertywidget.cpp:471
+msgid "&Load image from path"
+msgstr ""
+
+#: propertywidget.cpp:475
+msgid "&Read image path from expression"
+msgstr ""
+
+#: propertywidget.cpp:489
+msgid "&Size"
+msgstr ""
+
+#: propertywidget.cpp:491
+msgid "&None"
+msgstr ""
+
+#: propertywidget.cpp:493
+msgid "S&cale"
+msgstr ""
+
+#: propertywidget.cpp:495
+msgid "Mirror &Horizontaly"
+msgstr ""
+
+#: propertywidget.cpp:496
+msgid "Mirror &Vertically"
+msgstr ""
+
+#: propertywidget.cpp:522
+#, c-format
+msgid "Image format not supported for file: %1"
+msgstr ""
+
+#: propertywidget.cpp:611
+msgid "Evaluate JavsScript code to define the visibility of this item:"
+msgstr ""
+
+#: rectsettingsdlg.cpp:54 rectsettingsdlg.cpp:145
+msgid "Settings"
+msgstr ""
+
+#: rectsettingsdlg.cpp:71
+msgid "&Enable Border"
+msgstr ""
+
+#: rectsettingsdlg.cpp:73
+msgid "Fill Color:"
+msgstr ""
+
+#: rectsettingsdlg.cpp:77
+msgid "Border Color:"
+msgstr ""
+
+#: rectsettingsdlg.cpp:79
+msgid "Border Width:"
+msgstr ""
+
+#: smalldialogs.cpp:35
+msgid "Add Barcode_basic"
+msgstr ""
+
+#: smalldialogs.cpp:61
+msgid "Add Items"
+msgstr ""
+
+#: smalldialogs.cpp:68
+msgid "Edit Item"
+msgstr ""
+
+#: smalldialogs.cpp:92
+msgid "Article:"
+msgstr ""
+
+#: sqltables.cpp:123
+msgid "<qt>Unable to open database: "
+msgstr ""
+
+#: sqltables.cpp:145
+msgid "We are going to re-create the tables '"
+msgstr ""
+
+#: sqltables.cpp:147
+msgid "' and '"
+msgstr ""
+
+#: sqltables.cpp:169
+msgid "<qt>Can't create database "
+msgstr ""
+
+#: sqltables.cpp:169
+msgid "<br>You can continue if the database exists already.</qt>"
+msgstr ""
+
+#: sqltables.cpp:183
+msgid "<qt>Can't connect to database to create table."
+msgstr ""
+
+#: sqltables.cpp:183
+msgid "<br>You can continue if the table exists already.</qt>"
+msgstr ""
+
+#: sqltables.cpp:195
+msgid ""
+"KBarcode could not create the required database. Please create it manually."
+msgstr ""
+
+#: sqltables.cpp:276
+msgid "Created table "
+msgstr ""
+
+#: sqltables.cpp:276
+msgid " successfully!"
+msgstr ""
+
+#: sqltables.cpp:283
+msgid "We are going to delete the complete table: "
+msgstr ""
+
+#: sqltables.cpp:305
+msgid "We are going to delete the complete tables: "
+msgstr ""
+
+#: sqltables.cpp:321
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:326
+msgid "SQL import progress:"
+msgstr ""
+
+#: sqltables.cpp:337
+msgid "Can't open the data file containing the label definitions."
+msgstr ""
+
+#: sqltables.cpp:346
+msgid "<qt>Can't execute command:<br><b>"
+msgstr ""
+
+#: sqltables.cpp:438
+msgid ""
+"The SQL tables of KBarcode have changed since the last version. KBarcode "
+"updated them without any loss of data."
+msgstr ""
+
+#: sqltables.cpp:459 sqltables.cpp:479
+msgid "Connected successfully to your database"
+msgstr ""
+
+#: sqltables.cpp:523
+msgid "Database Settings"
+msgstr ""
+
+#: sqltables.cpp:533
+msgid "Username :"
+msgstr ""
+
+#: sqltables.cpp:540
+msgid "Password :"
+msgstr ""
+
+#: sqltables.cpp:548
+msgid "Database :"
+msgstr ""
+
+#: sqltables.cpp:555
+msgid "Host :"
+msgstr ""
+
+#: sqltables.cpp:562
+msgid "Driver :"
+msgstr ""
+
+#: sqltables.cpp:575
+msgid "&Autoconnect on program start"
+msgstr ""
+
+#: sqltables.cpp:579
+msgid "&Test Settings"
+msgstr ""
+
+#: sqltables.cpp:583
+msgid "<b>You have to test your database settings before you can procede.</b>"
+msgstr ""
+
+#: textlineedit.cpp:130
+msgid "&Mag. Vert.:"
+msgstr ""
+
+#: textlineedit.cpp:132
+msgid "&Mag. Hor.:"
+msgstr ""
+
+#: tokendialog.cpp:65 tokendialog.cpp:93 tokendialog.cpp:109
+msgid "What do you want to insert?"
+msgstr ""
+
+#: tokendialog.cpp:67
+msgid "Insert a &fixed data field"
+msgstr ""
+
+#: tokendialog.cpp:68
+msgid "Insert a &custom SQL query, variable or JavaScript function"
+msgstr ""
+
+#: tokendialog.cpp:72
+msgid "Step 1 of 3"
+msgstr ""
+
+#: tokendialog.cpp:79
+msgid "Step 2 of 3"
+msgstr ""
+
+#: tokendialog.cpp:86
+msgid "Step 3 of 3"
+msgstr ""
+
+#: tokendialog.cpp:94
+msgid "&Select from a list of all tokens"
+msgstr ""
+
+#: tokendialog.cpp:95
+msgid "Insert printing &informations"
+msgstr ""
+
+#: tokendialog.cpp:96
+msgid "&Insert a database field"
+msgstr ""
+
+#: tokendialog.cpp:97
+msgid "Insert a &date/time function"
+msgstr ""
+
+#: tokendialog.cpp:98
+msgid "Insert an &addressbook field"
+msgstr ""
+
+#: tokendialog.cpp:111
+msgid "Insert a custom &variable"
+msgstr ""
+
+#: tokendialog.cpp:112
+msgid "Insert a &SQL query"
+msgstr ""
+
+#: tokendialog.cpp:113
+msgid "Insert a &JavaScript function"
+msgstr ""
+
+#: tokendialog.cpp:135
+msgid "&Category:"
+msgstr ""
+
+#: tokendialog.cpp:139
+msgid "&Token:"
+msgstr ""
+
+#: tokendialog.cpp:141 tokendialog.cpp:176
+msgid "Token"
+msgstr ""
+
+#: tokendialog.cpp:142 tokendialog.cpp:177
+msgid "Description"
+msgstr ""
+
+#: tokendialog.cpp:146
+msgid "&Custom Expression to be inserted in the token."
+msgstr ""
+
+#: tokendialog.cpp:151
+msgid ""
+"<qt>Certain tokens, like for exaple the sqlquery token need arguments. In "
+"the case of the sqlquery token, the sure has to enter a sql query in this "
+"text field.</qt>"
+msgstr ""
+
+#: tokendialog.cpp:191
+msgid "&Create a new custom variable"
+msgstr ""
+
+#: tokendialog.cpp:194
+msgid "&Insert an existing custom variable"
+msgstr ""
+
+#: tokendialog.cpp:219
+msgid ""
+"<qt><b>No SQL connection found!</b><br>You can build a query, but you will "
+"not be able to execute or test it right now.<br></qt>"
+msgstr ""
+
+#: tokendialog.cpp:224
+msgid "&SQL Query:"
+msgstr ""
+
+#: tokendialog.cpp:226
+msgid "&Test"
+msgstr ""
+
+#: tokendialog.cpp:231
+msgid "Query test results:"
+msgstr ""
+
+#: tokendialog.cpp:246
+msgid "/* Place your JavaScript code into this text field. */\n"
+msgstr ""
+
+#: tokendialog.cpp:339
+msgid "All"
+msgstr ""
+
+#: tokendialog.cpp:352 tokendialog.cpp:420
+msgid "Variable defined by the user for this label."
+msgstr ""
+
+#: tokendialog.cpp:417 tokenprovider.cpp:209
+msgid "Custom Values"
+msgstr ""
+
+#: tokenprovider.cpp:210
+msgid "Date & Time"
+msgstr ""
+
+#: tokenprovider.cpp:211
+msgid "Addressbook"
+msgstr ""
+
+#: tokenprovider.cpp:216
+msgid "Article description from barcode_basic"
+msgstr ""
+
+#: tokenprovider.cpp:217
+msgid "Article number from barcode_basic"
+msgstr ""
+
+#: tokenprovider.cpp:224
+msgid "customer number of the current customer"
+msgstr ""
+
+#: tokenprovider.cpp:225
+msgid "name of the current customer"
+msgstr ""
+
+#: tokenprovider.cpp:226
+msgid "Barcode number from barcode_basic"
+msgstr ""
+
+#: tokenprovider.cpp:228
+msgid "group of the current article"
+msgstr ""
+
+#: tokenprovider.cpp:229
+msgid "Barcode encoding type from barcode_basic"
+msgstr ""
+
+#: tokenprovider.cpp:230
+msgid "User readable barcode encoding type from barcode_basic"
+msgstr ""
+
+#: tokenprovider.cpp:235
+msgid "Path and filename of this file"
+msgstr ""
+
+#: tokenprovider.cpp:236
+msgid "number of labels currently printed during this printout"
+msgstr ""
+
+#: tokenprovider.cpp:237
+msgid "current column on the page"
+msgstr ""
+
+#: tokenprovider.cpp:238
+msgid "current row on the page"
+msgstr ""
+
+#: tokenprovider.cpp:239
+msgid "Current page"
+msgstr ""
+
+#: tokenprovider.cpp:240
+msgid "Current resolution"
+msgstr ""
+
+#: tokenprovider.cpp:241
+msgid "Include a serial number on your labels."
+msgstr ""
+
+#: tokenprovider.cpp:247
+msgid "Execute java script code"
+msgstr ""
+
+#: tokenprovider.cpp:248
+msgid "Insert the result of a custom sql query"
+msgstr ""
+
+#: tokenprovider.cpp:249
+msgid "Insert a custom variable"
+msgstr ""
+
+#: tokenprovider.cpp:254
+msgid "Date formated as configured in the preferences"
+msgstr ""
+
+#: tokenprovider.cpp:255
+msgid "Short Weekday Name"
+msgstr ""
+
+#: tokenprovider.cpp:256
+msgid "Full Weekday Name"
+msgstr ""
+
+#: tokenprovider.cpp:257
+msgid "Short Month Name"
+msgstr ""
+
+#: tokenprovider.cpp:258
+msgid "Full Month Name"
+msgstr ""
+
+#: tokenprovider.cpp:259
+msgid "Date-Time"
+msgstr ""
+
+#: tokenprovider.cpp:260
+msgid "Century"
+msgstr ""
+
+#: tokenprovider.cpp:261
+msgid "Day Number (01-31)"
+msgstr ""
+
+#: tokenprovider.cpp:262
+msgid "Month-Day-year"
+msgstr ""
+
+#: tokenprovider.cpp:263
+msgid "Day Number ( 1-31)"
+msgstr ""
+
+#: tokenprovider.cpp:264
+msgid "Year-Month-day"
+msgstr ""
+
+#: tokenprovider.cpp:265
+msgid "Week Year (yy)"
+msgstr ""
+
+#: tokenprovider.cpp:266
+msgid "Week Year (yyyy)"
+msgstr ""
+
+#: tokenprovider.cpp:267
+msgid "Hour (01-24)"
+msgstr ""
+
+#: tokenprovider.cpp:268
+msgid "Hour (1-12)"
+msgstr ""
+
+#: tokenprovider.cpp:269
+msgid "Day of Year"
+msgstr ""
+
+#: tokenprovider.cpp:270
+msgid "Month Number (01-12)"
+msgstr ""
+
+#: tokenprovider.cpp:271
+msgid "Minute (00-59)"
+msgstr ""
+
+#: tokenprovider.cpp:272
+msgid "a.m./p.m."
+msgstr ""
+
+#: tokenprovider.cpp:273
+msgid "Time (h:m:s am/pm)"
+msgstr ""
+
+#: tokenprovider.cpp:274
+msgid "Time (HH:MM)"
+msgstr ""
+
+#: tokenprovider.cpp:275
+msgid "Seconds (00-59)"
+msgstr ""
+
+#: tokenprovider.cpp:276
+msgid "Time (HH:MM:SS)"
+msgstr ""
+
+#: tokenprovider.cpp:277
+msgid "Weekday (1=Monday...)"
+msgstr ""
+
+#: tokenprovider.cpp:278 tokenprovider.cpp:281
+msgid "Week Number (00-53)"
+msgstr ""
+
+#: tokenprovider.cpp:279
+msgid "Week Number (01-53)"
+msgstr ""
+
+#: tokenprovider.cpp:280
+msgid "Weekday (0=Sunday...)"
+msgstr ""
+
+#: tokenprovider.cpp:282
+msgid "Local Date"
+msgstr ""
+
+#: tokenprovider.cpp:283
+msgid "Local Time"
+msgstr ""
+
+#: tokenprovider.cpp:284
+msgid "Year (00-99)"
+msgstr ""
+
+#: tokenprovider.cpp:285
+msgid "Year (YYYY)"
+msgstr ""
+
+#: tokenprovider.cpp:286
+msgid "Offset from UTC"
+msgstr ""
+
+#: tokenprovider.cpp:287
+msgid "Timezone Name"
+msgstr ""
+
+#: tokenprovider.cpp:292
+msgid "Name"
+msgstr ""
+
+#: tokenprovider.cpp:296
+msgid "Full E-Mail"
+msgstr ""
+
+#: tokenprovider.cpp:319
+msgid "Formatted Address"
+msgstr ""
+
+#: tokenprovider.cpp:825
+msgid "ERROR: Empty SQL Query"
+msgstr ""
+
+#: xmlutils.cpp:343
+msgid ""
+"<qt>This appears file appears to be created by an older version of KBarcode."
+"<br>Please check if the used label definition is correct:<br><b>"
+msgstr ""
diff --git a/po/sv.po b/translations/messages/sv.po
index 3fa63b9..a8d20e0 100644
--- a/po/sv.po
+++ b/translations/messages/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Anton Vaaranmaa <antonv@postikaista.net>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Anton Vaaranmaa"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -725,12 +725,12 @@ msgstr "Avskiljaren är tom. Ge den ett värde."
msgid "<qt>The following items can not be added:"
msgstr "<qt>Följande objekt kan inte läggas till:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
#, fuzzy
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>Kan inte köra kommandot:<br><b>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr ""
@@ -771,7 +771,7 @@ msgstr "Förflyttat objekt"
msgid "Raised or lowered an item"
msgstr ""
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
#, fuzzy
msgid "Protected Item"
msgstr "Förflyttat objekt"
@@ -1023,9 +1023,9 @@ msgid ""
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Inga QT SQL-drivrutiner är installerade. KBarcode behöver dessa drivrutiner "
+"Inga TQt SQL-drivrutiner är installerade. KBarcode behöver dessa drivrutiner "
"för att kunna ansluta sig till SQL databaser. Drivrutinerna ingår i "
-"källkodsdistributionen av QT och troligtvis ingår de också i distributionen "
+"källkodsdistributionen av TQt och troligtvis ingår de också i distributionen "
"du använder. Var god och installera dessa drivrutiner."
#: csvimportdlg.cpp:61
@@ -1244,44 +1244,44 @@ msgstr "Vertikal storlek (inkl. marginal):"
msgid "Horizontal Gap"
msgstr "Horisontal storlek (inkl. marginal):"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
#, fuzzy
msgid "&Position && Size"
msgstr "Position: "
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
#, fuzzy
msgid "&Border"
msgstr "Or&dning"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
#, fuzzy
msgid "&Fill Color"
msgstr "Rutnätets färg:"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "&Streckkod"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
#, fuzzy
msgid "&Rotation"
msgstr "Rotation:"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
#, fuzzy
msgid "&Text"
msgstr "Text:"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
msgid "&Image"
msgstr ""
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr ""
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
#, fuzzy
msgid "Property changed"
msgstr "Projektledare"
@@ -1423,7 +1423,7 @@ msgid ""
"IMAGE and BARCODE."
msgstr ""
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Statisk"
@@ -1572,32 +1572,32 @@ msgstr ""
msgid "&Properties"
msgstr "&Egenskaper"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Beskrivning av etiketten"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Ange beskrivning"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Storlek: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Etikettmall: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Stavningskontroll"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
#, fuzzy
msgid "The file %1 does not exist."
msgstr "<qt>Denna fil existerar inte!<br></qt>"
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>Dokumentet har ändrats.<br><br>Vill du spara det?</qt>"
@@ -1678,81 +1678,81 @@ msgstr "&Streckkod"
msgid "KBarcode is a barcode and label printing application for TDE."
msgstr "KBarcode är ett streckkods- och etikettutskriftsprogram för TDE"
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Programmerare"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Projektledare"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "Har skrivit GNU Barcode vilket KBarcode baserar sig på."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr ""
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "Översättning till italienska"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Översättning till svenska och finska. Ikoner."
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "Översättning till spanska"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Översättning till ungerska"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Tab icon källkod stulen från hans utmärkta program qtella."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "Har skrivit RichText KPart"
-#: main.cpp:107
+#: main.cpp:105
#, fuzzy
msgid "French Translation"
msgstr "Översättning till spanska"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr ""
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr ""
-#: main.cpp:110
+#: main.cpp:108
#, fuzzy
msgid "Made the Netherlands translation"
msgstr "Översättning till italienska"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr ""
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr ""
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr ""
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2668,7 +2668,7 @@ msgstr ""
msgid "ERROR: Empty SQL Query"
msgstr ""
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"
diff --git a/po/tr.po b/translations/messages/tr.po
index b7e7a0e..4ae172d 100644
--- a/po/tr.po
+++ b/translations/messages/tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yeni\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-25 00:22+0100\n"
+"POT-Creation-Date: 2023-06-29 18:21+0000\n"
"PO-Revision-Date: 2006-03-21 17:33+0200\n"
"Last-Translator: Furkan Duman <coderlord@gmail.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11\n"
-#: _translatorinfo:1
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Furkan Duman"
-#: _translatorinfo:2
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -677,11 +677,11 @@ msgstr "Ayıraç boş. Lütfen bir değer atayın."
msgid "<qt>The following items can not be added:"
msgstr "<qt>İzleyen öğeler eklenemedi:"
-#: batchwizard.cpp:1052
+#: batchwizard.cpp:1051
msgid "<qt>Can't execute SQL query:<br>"
msgstr "<qt>SQL sorgusu çalıştırılamadı:<br>"
-#: batchwizard.cpp:1079
+#: batchwizard.cpp:1078
#, c-format
msgid "Can't open file: %1"
msgstr "Dosya açılamadı: %1"
@@ -720,7 +720,7 @@ msgstr "Korunmuş Öğe"
msgid "Raised or lowered an item"
msgstr ""
-#: commands.h:203 labeleditor.cpp:739
+#: commands.h:203 labeleditor.cpp:736
msgid "Protected Item"
msgstr "Korunmuş Öğe"
@@ -967,8 +967,8 @@ msgid ""
"distribution and should also be part of your distribution. Please install "
"them first."
msgstr ""
-"Qt SQL sürücüleri yüklenmemiş. KBarcode, farklı SQL veri tabanlarına erişmek "
-"için bu sürücülere ihtiyaç duyar. Bu sürücüler Qt Source dağıtımının bir "
+"TQt SQL sürücüleri yüklenmemiş. KBarcode, farklı SQL veri tabanlarına erişmek "
+"için bu sürücülere ihtiyaç duyar. Bu sürücüler TQt Source dağıtımının bir "
"parçasıdır ve aynı zamanda sizin dağıtımınızın da bir parçası olmalıdır. "
"Lütfen ilk önce onları kurun."
@@ -1182,39 +1182,39 @@ msgstr "Düşey Boşluk"
msgid "Horizontal Gap"
msgstr "Yatay Boşluk"
-#: documentitemdlg.cpp:34
+#: documentitemdlg.cpp:33
msgid "&Position && Size"
msgstr "&Konum && Boyut"
-#: documentitemdlg.cpp:37
+#: documentitemdlg.cpp:36
msgid "&Border"
msgstr "Çerçe&ve"
-#: documentitemdlg.cpp:42
+#: documentitemdlg.cpp:41
msgid "&Fill Color"
msgstr "&Dolgu Rengi"
-#: documentitemdlg.cpp:47 labeleditor.cpp:523
+#: documentitemdlg.cpp:46 labeleditor.cpp:523
msgid "&Barcode"
msgstr "&Barkod"
-#: documentitemdlg.cpp:52
+#: documentitemdlg.cpp:51
msgid "&Rotation"
msgstr "&Döndürme"
-#: documentitemdlg.cpp:55 documentitemdlg.cpp:66
+#: documentitemdlg.cpp:54 documentitemdlg.cpp:65
msgid "&Text"
msgstr "&Metin"
-#: documentitemdlg.cpp:60 propertywidget.cpp:470
+#: documentitemdlg.cpp:59 propertywidget.cpp:470
msgid "&Image"
msgstr "&Resim"
-#: documentitemdlg.cpp:78
+#: documentitemdlg.cpp:77
msgid "&Visibility"
msgstr "&Görünürlük"
-#: documentitemdlg.cpp:109
+#: documentitemdlg.cpp:108
msgid "Property changed"
msgstr "Özellik değiştirildi"
@@ -1354,7 +1354,7 @@ msgstr ""
"%1 --çıktısı için geçerli bir çıktı biçimi değil. Geçerli değerler, "
"POSTSCRIPT, IMAGE veya BARCODE'dur."
-#: label.cpp:188
+#: label.cpp:197
msgid "Static"
msgstr "Sabit"
@@ -1494,31 +1494,31 @@ msgstr "Konum ve Boyutu &Koru"
msgid "&Properties"
msgstr "&Seçenekler"
-#: labeleditor.cpp:675
+#: labeleditor.cpp:672
msgid "Label Description"
msgstr "Etiket Açıklaması"
-#: labeleditor.cpp:676
+#: labeleditor.cpp:673
msgid "Please enter a description:"
msgstr "Lütfen bir açıklama girin:"
-#: labeleditor.cpp:705
+#: labeleditor.cpp:702
msgid "Size: "
msgstr "Boyut: "
-#: labeleditor.cpp:708
+#: labeleditor.cpp:705
msgid "Label Template: "
msgstr "Etiket Şablonu: "
-#: labeleditor.cpp:838
+#: labeleditor.cpp:835
msgid "Spellchecking"
msgstr "Yazım denetimi"
-#: labeleditor.cpp:1008
+#: labeleditor.cpp:1005
msgid "The file %1 does not exist."
msgstr "%1 dosyası bulunamadı."
-#: labeleditor.cpp:1043
+#: labeleditor.cpp:1040
msgid ""
"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
msgstr "<qt>Belge değiştirilmiş.<br><br>Kaydetmek istiyor musunuz?</qt>"
@@ -1600,79 +1600,79 @@ msgstr "Barkod"
msgid "KBarcode is a barcode and label printing application for TDE."
msgstr "KBarcode, TDE için bir barkod ve etiket yazdırma uygulamasıdır."
-#: main.cpp:90
+#: main.cpp:88
msgid "Programmer"
msgstr "Programlayan"
-#: main.cpp:92
+#: main.cpp:90
msgid "Project Manager"
msgstr "Proje Yöneticisi"
-#: main.cpp:95
+#: main.cpp:93
msgid "Wrote GNU Barcode on which kbarcode is based."
msgstr "KBarcode'nin temeli olan GNU Barcode'yi yazdı."
-#: main.cpp:97
+#: main.cpp:95
msgid "Author of Barcode Writer in Pure Postscript"
msgstr "Pure Postscript içindeki Barcode Writer'in yazarı"
-#: main.cpp:99
+#: main.cpp:97
msgid "Italian translation"
msgstr "İtalyanca çeviri"
-#: main.cpp:101
+#: main.cpp:99
msgid "Finnish and Swedish translation, created the KBarcode icon"
msgstr "Fince ve İsveççe çeviri, KBarcode simgesinin yaratıcısı"
-#: main.cpp:102
+#: main.cpp:100
msgid "Spanish translation"
msgstr "İspanyolca çeviri"
-#: main.cpp:103
+#: main.cpp:101
msgid "Hungarian translation"
msgstr "Macarca çeviri"
-#: main.cpp:105
+#: main.cpp:103
msgid "Tab icon code stolen from his excellent app qtella."
msgstr "Sekme simgesi kodu, onun mükemmel uygulaması qtella'dan araklandı."
-#: main.cpp:106
+#: main.cpp:104
msgid "Wrote the RichText KPart"
msgstr "RichText KPart'ı yazdı"
-#: main.cpp:107
+#: main.cpp:105
msgid "French Translation"
msgstr "Fransızca Çeviri"
-#: main.cpp:108
+#: main.cpp:106
msgid "Help with ZPL and IPL code"
msgstr "ZPL ve IPL kodu yardımı"
-#: main.cpp:109
+#: main.cpp:107
msgid "Wrote many patches to improve KBarcode"
msgstr "KBarcode'yi geliştirmek için bir sürü yama yazdı"
-#: main.cpp:110
+#: main.cpp:108
msgid "Made the Netherlands translation"
msgstr "Hollandaca çeviriyi yaptı"
-#: main.cpp:111
+#: main.cpp:109
msgid "Added lot's of useful data fields to kbarcode"
msgstr "KBarcode'ye bir çok kullanışlı veri alanı ekledi"
-#: main.cpp:112
+#: main.cpp:110
msgid "Added TEC barcode printer support"
msgstr "TEC barkod yazdırma desteği ekledi"
-#: main.cpp:113
+#: main.cpp:111
msgid "Added EPCL barcode printer support"
msgstr "EPCL barkod yazdırma desteği ekledi"
-#: main.cpp:114
+#: main.cpp:112
msgid "Wrote bugfixes."
msgstr ""
-#: main.cpp:115
+#: main.cpp:113
msgid "Maintainer (TDE project)"
msgstr ""
@@ -2548,7 +2548,7 @@ msgstr "Biçimlendirilmiş Adres"
msgid "ERROR: Empty SQL Query"
msgstr "HATA: Boş SQL Sorgusu"
-#: xmlutils.cpp:344
+#: xmlutils.cpp:343
msgid ""
"<qt>This appears file appears to be created by an older version of KBarcode."
"<br>Please check if the used label definition is correct:<br><b>"