Merge lp:~cosmos-door/ubuntu/trusty/aeskulap/merge-1272642 into lp:ubuntu/trusty/aeskulap

Proposed by Mitsuya Shibata
Status: Merged
Approved by: Iain Lane
Approved revision: 14
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~cosmos-door/ubuntu/trusty/aeskulap/merge-1272642
Merge into: lp:ubuntu/trusty/aeskulap
Diff against target: 31329 lines (+388/-29916)
47 files modified
.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
.pc/10_desktop.patch/src/aeskulap.desktop (+0/-11)
.pc/20_gcc4.4.patch/configuration/aconfiguration-gconf.cpp (+0/-275)
.pc/20_i18n_pt.patch/po/pt.po (+0/-591)
.pc/30_as_needed.patch/src/Makefile.am (+0/-85)
.pc/DcmElement_has_no_member_error.patch/imagepool/poolassociation.h (+0/-200)
.pc/applied-patches (+0/-10)
.pc/circular_svg_icon.patch/pixmaps/aeskulap.svg (+0/-169)
.pc/dcmdata_debug.patch/imagepool/poolfindassociation.cpp (+0/-143)
.pc/dcmdata_debug.patch/imagepool/poolmoveassociation.cpp (+0/-342)
.pc/findAndCopyElement.patch/imagepool/dicomdir.cpp (+0/-255)
.pc/oflog.patch/configure (+0/-25949)
.pc/oflog.patch/configure.in (+0/-143)
.pc/patientsname.patch/imagepool/netloader.cpp (+0/-197)
.pc/patientsname.patch/imagepool/netquery.cpp (+0/-452)
.pc/patientsname.patch/imagepool/poolinstance.cpp (+0/-719)
configuration/aconfiguration-gconf.cpp (+0/-1)
configure (+1/-1)
configure.in (+1/-1)
debian/changelog (+27/-0)
debian/control (+19/-12)
debian/patches/10_desktop.patch (+9/-6)
debian/patches/20_gcc4.4.patch (+2/-2)
debian/patches/20_i18n_pt.patch (+8/-8)
debian/patches/30_as_needed.patch (+3/-3)
debian/patches/DcmElement_has_no_member_error.patch (+3/-5)
debian/patches/circular_svg_icon.patch (+2/-4)
debian/patches/dcmdata_debug.patch (+7/-8)
debian/patches/findAndCopyElement.patch (+4/-6)
debian/patches/move_icon_to_correct_dir.patch (+12/-0)
debian/patches/oflog.patch (+9/-10)
debian/patches/patientsname.patch (+14/-17)
debian/patches/remove_rpath.patch (+28/-0)
debian/patches/series (+2/-0)
imagepool/dicomdir.cpp (+30/-30)
imagepool/netloader.cpp (+1/-1)
imagepool/netquery.cpp (+3/-3)
imagepool/poolassociation.h (+3/-1)
imagepool/poolfindassociation.cpp (+1/-1)
imagepool/poolinstance.cpp (+4/-4)
imagepool/poolmoveassociation.cpp (+1/-0)
pixmaps/aeskulap.svg (+37/-43)
po/pt.po (+151/-200)
src/Makefile.am (+3/-3)
src/aeskulap.desktop (+3/-2)
To merge this branch: bzr merge lp:~cosmos-door/ubuntu/trusty/aeskulap/merge-1272642
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+203205@code.launchpad.net

Description of the change

Please merge the package from Debian unstable (main).

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

It looks like this got synced so we have these changes already. That means that this merge proposal isn't required, but still - thanks for your work. :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory '.pc'
2=== removed file '.pc/.quilt_patches'
3--- .pc/.quilt_patches 2012-09-09 12:44:16 +0000
4+++ .pc/.quilt_patches 1970-01-01 00:00:00 +0000
5@@ -1,1 +0,0 @@
6-debian/patches
7
8=== removed file '.pc/.quilt_series'
9--- .pc/.quilt_series 2012-09-09 12:44:16 +0000
10+++ .pc/.quilt_series 1970-01-01 00:00:00 +0000
11@@ -1,1 +0,0 @@
12-series
13
14=== removed file '.pc/.version'
15--- .pc/.version 2012-01-02 22:24:12 +0000
16+++ .pc/.version 1970-01-01 00:00:00 +0000
17@@ -1,1 +0,0 @@
18-2
19
20=== removed directory '.pc/10_desktop.patch'
21=== removed directory '.pc/10_desktop.patch/src'
22=== removed file '.pc/10_desktop.patch/src/aeskulap.desktop'
23--- .pc/10_desktop.patch/src/aeskulap.desktop 2012-01-02 22:24:12 +0000
24+++ .pc/10_desktop.patch/src/aeskulap.desktop 1970-01-01 00:00:00 +0000
25@@ -1,11 +0,0 @@
26-[Desktop Entry]
27-Encoding=UTF-8
28-Name=Aeskulap Viewer
29-Comment=Medical image viewer and DICOM network client
30-Exec=aeskulap
31-Icon=aeskulap
32-Terminal=false
33-Type=Application
34-Categories=Application;Graphics;
35-StartupNotify=true
36-MimeType=image/dicom
37
38=== removed directory '.pc/20_gcc4.4.patch'
39=== removed directory '.pc/20_gcc4.4.patch/configuration'
40=== removed file '.pc/20_gcc4.4.patch/configuration/aconfiguration-gconf.cpp'
41--- .pc/20_gcc4.4.patch/configuration/aconfiguration-gconf.cpp 2012-01-02 22:24:12 +0000
42+++ .pc/20_gcc4.4.patch/configuration/aconfiguration-gconf.cpp 1970-01-01 00:00:00 +0000
43@@ -1,275 +0,0 @@
44-/*
45- Aeskulap Configuration - persistent configuration interface library
46- Copyright (C) 2005 Alexander Pipelka
47-
48- This library is free software; you can redistribute it and/or
49- modify it under the terms of the GNU Library General Public
50- License as published by the Free Software Foundation; either
51- version 2 of the License, or (at your option) any later version.
52-
53- This library is distributed in the hope that it will be useful,
54- but WITHOUT ANY WARRANTY; without even the implied warranty of
55- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
56- Library General Public License for more details.
57-
58- You should have received a copy of the GNU Library General Public
59- License along with this library; if not, write to the Free
60- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
61-
62- Alexander Pipelka
63- pipelka@teleweb.at
64-
65- Last Update: $Author: braindead $
66- Update Date: $Date: 2007/05/10 14:29:59 $
67- Source File: $Source: /sources/aeskulap/aeskulap/configuration/aconfiguration-gconf.cpp,v $
68- CVS/RCS Revision: $Revision: 1.7 $
69- Status: $State: Exp $
70-*/
71-
72-#include <gconfmm.h>
73-#include <iostream>
74-
75-namespace Aeskulap {
76-
77-static Glib::RefPtr<Gnome::Conf::Client> m_conf_client;
78-
79-Configuration::Configuration() {
80- if(!m_conf_client) {
81- std::cout << "Gnome::Conf::init()" << std::endl;
82- Gnome::Conf::init();
83- m_conf_client = Gnome::Conf::Client::get_default_client();
84- }
85-
86- m_conf_client->add_dir("/apps/aeskulap/preferences");
87- m_conf_client->add_dir("/apps/aeskulap/presets");
88- m_conf_client->add_dir("/apps/aeskulap/presets/windowlevel");
89-
90- if(!m_conf_client->dir_exists("/apps/aeskulap/presets/windowlevel/CT")) {
91- add_default_presets_ct();
92- }
93-}
94-
95-std::string Configuration::get_local_aet() {
96- std::string local_aet = m_conf_client->get_string("/apps/aeskulap/preferences/local_aet");
97-
98- if(local_aet.empty()) {
99- local_aet = "AESKULAP";
100- set_local_aet(local_aet);
101- }
102-
103- return local_aet;
104-}
105-
106-void Configuration::set_local_aet(const std::string& aet) {
107- m_conf_client->set("/apps/aeskulap/preferences/local_aet", aet);
108-}
109-
110-unsigned int Configuration::get_local_port() {
111- m_conf_client = Gnome::Conf::Client::get_default_client();
112- gint local_port = m_conf_client->get_int("/apps/aeskulap/preferences/local_port");
113-
114- if(local_port <= 0) {
115- local_port = 6000;
116- set_local_port(local_port);
117- }
118-
119- return (unsigned int)local_port;
120-}
121-
122-void Configuration::set_local_port(unsigned int port) {
123- if(port <= 0) {
124- port = 6000;
125- }
126- m_conf_client->set("/apps/aeskulap/preferences/local_port", (gint)port);
127-}
128-
129-std::string Configuration::get_encoding() {
130- std::string charset = m_conf_client->get_string("/apps/aeskulap/preferences/characterset");
131-
132- if(charset.empty()) {
133- charset = "ISO_IR 100";
134- set_encoding(charset);
135- }
136-
137- return charset;
138-}
139-
140-void Configuration::set_encoding(const std::string& encoding) {
141- m_conf_client->set("/apps/aeskulap/preferences/characterset", encoding);
142-}
143-
144-Configuration::ServerList* Configuration::get_serverlist() {
145- Configuration::ServerList* list = new Configuration::ServerList;
146-
147- Gnome::Conf::SListHandle_ValueString aet_list = m_conf_client->get_string_list("/apps/aeskulap/preferences/server_aet");
148- Gnome::Conf::SListHandle_ValueInt port_list = m_conf_client->get_int_list("/apps/aeskulap/preferences/server_port");
149- Gnome::Conf::SListHandle_ValueString hostname_list = m_conf_client->get_string_list("/apps/aeskulap/preferences/server_hostname");
150- Gnome::Conf::SListHandle_ValueString description_list = m_conf_client->get_string_list("/apps/aeskulap/preferences/server_description");
151- Gnome::Conf::SListHandle_ValueString group_list = m_conf_client->get_string_list("/apps/aeskulap/preferences/server_group");
152- Gnome::Conf::SListHandle_ValueBool lossy_list = m_conf_client->get_bool_list("/apps/aeskulap/preferences/server_lossy");
153- Gnome::Conf::SListHandle_ValueBool relational_list = m_conf_client->get_bool_list("/apps/aeskulap/preferences/server_relational");
154-
155- Gnome::Conf::SListHandle_ValueString::iterator a = aet_list.begin();
156- Gnome::Conf::SListHandle_ValueInt::iterator p = port_list.begin();
157- Gnome::Conf::SListHandle_ValueString::iterator h = hostname_list.begin();
158- Gnome::Conf::SListHandle_ValueString::iterator d = description_list.begin();
159- Gnome::Conf::SListHandle_ValueString::iterator g = group_list.begin();
160- Gnome::Conf::SListHandle_ValueBool::iterator l = lossy_list.begin();
161- Gnome::Conf::SListHandle_ValueBool::iterator r = relational_list.begin();
162-
163- for(; h != hostname_list.end() && a != aet_list.end() && p != port_list.end(); a++, p++, h++) {
164-
165- std::string servername;
166- if(d != description_list.end()) {
167- servername = *d;
168- d++;
169- }
170- else {
171- char buffer[50];
172- snprintf(buffer, sizeof(buffer), "Server%li", list->size()+1);
173- servername = buffer;
174- }
175-
176- ServerData& s = (*list)[servername];
177- s.m_aet = *a;
178- s.m_port = *p;
179- s.m_hostname = *h;
180- s.m_name = servername;
181- s.m_lossy = false;
182- s.m_relational = false;
183-
184- if(l != lossy_list.end()) {
185- s.m_lossy = *l;
186- l++;
187- }
188-
189- if(g != group_list.end()) {
190- s.m_group = *g;
191- g++;
192- }
193-
194- if(r != relational_list.end()) {
195- s.m_relational = *r;
196- r++;
197- }
198-
199- }
200-
201- return list;
202-}
203-
204-void Configuration::set_serverlist(std::vector<ServerData>& list) {
205- std::vector< Glib::ustring > aet_list;
206- std::vector< Glib::ustring > hostname_list;
207- std::vector< int > port_list;
208- std::vector< Glib::ustring > description_list;
209- std::vector< Glib::ustring > group_list;
210- std::vector< gboolean > lossy_list;
211- std::vector< gboolean > relational_list;
212-
213- std::vector<ServerData>::iterator i;
214- for(i = list.begin(); i != list.end(); i++) {
215- aet_list.push_back(i->m_aet);
216- hostname_list.push_back(i->m_hostname);
217- port_list.push_back(i->m_port);
218- description_list.push_back(i->m_name);
219- group_list.push_back(i->m_group);
220- lossy_list.push_back(i->m_lossy);
221- relational_list.push_back(i->m_relational);
222- }
223-
224- m_conf_client->set_string_list("/apps/aeskulap/preferences/server_aet", aet_list);
225- m_conf_client->set_string_list("/apps/aeskulap/preferences/server_hostname", hostname_list);
226- m_conf_client->set_int_list("/apps/aeskulap/preferences/server_port", port_list);
227- m_conf_client->set_string_list("/apps/aeskulap/preferences/server_description", description_list);
228- m_conf_client->set_string_list("/apps/aeskulap/preferences/server_group", group_list);
229- m_conf_client->set_bool_list("/apps/aeskulap/preferences/server_lossy", lossy_list);
230- m_conf_client->set_bool_list("/apps/aeskulap/preferences/server_relational", relational_list);
231-}
232-
233-bool Configuration::get_windowlevel(const Glib::ustring& modality, const Glib::ustring& desc, WindowLevel& w) {
234- Glib::ustring base = "/apps/aeskulap/presets/windowlevel/"+modality+"/"+desc;
235-
236- if(!m_conf_client->dir_exists(base)) {
237- return false;
238- }
239-
240- if(m_conf_client->get_without_default(base+"/center").get_type() == Gnome::Conf::VALUE_INVALID) {
241- return false;
242- }
243-
244- w.modality = modality;
245- w.description = desc;
246- w.center = m_conf_client->get_int(base+"/center");
247- w.width = m_conf_client->get_int(base+"/width");
248-
249- return true;
250-}
251-
252-bool Configuration::get_windowlevel_list(const Glib::ustring& modality, WindowLevelList& list) {
253- if(modality.empty()) {
254- return false;
255- }
256-
257- Glib::ustring base = "/apps/aeskulap/presets/windowlevel/"+modality;
258-
259- std::vector< Glib::ustring > dirs = m_conf_client->all_dirs(base);
260- if(dirs.size() == 0) {
261- return false;
262- }
263-
264- list.clear();
265-
266- for(unsigned int i=0; i<dirs.size(); i++) {
267- WindowLevel w;
268- if(get_windowlevel(modality, get_name_from_path(dirs[i]), w)) {
269- list[w.description] = w;
270- }
271- }
272-
273- return true;
274-}
275-
276-bool Configuration::set_windowlevel(const WindowLevel& w) {
277- Glib::ustring base = "/apps/aeskulap/presets/windowlevel/"+w.modality+"/"+w.description;
278-
279- if(!m_conf_client->dir_exists(base)) {
280- m_conf_client->add_dir(base);
281- }
282-
283- m_conf_client->set(base+"/center", w.center);
284- m_conf_client->set(base+"/width", w.width);
285-
286- return true;
287-}
288-
289-bool Configuration::set_windowlevel_list(const Glib::ustring& modality, WindowLevelList& list) {
290- Glib::ustring base = "/apps/aeskulap/presets/windowlevel/"+modality;
291- WindowLevelList::iterator i;
292-
293- for(i = list.begin(); i != list.end(); i++) {
294- i->second.modality = modality;
295- set_windowlevel(i->second);
296- }
297-
298- return true;
299-}
300-
301-bool Configuration::unset_windowlevels(const Glib::ustring& modality) {
302- Glib::ustring base = "/apps/aeskulap/presets/windowlevel/"+modality;
303-
304- std::vector< Glib::ustring > dirs = m_conf_client->all_dirs(base);
305- if(dirs.size() == 0) {
306- return false;
307- }
308-
309- for(unsigned int i=0; i<dirs.size(); i++) {
310- Glib::ustring keybase = base+"/"+get_name_from_path(dirs[i]);
311- m_conf_client->unset(keybase+"/center");
312- m_conf_client->unset(keybase+"/width");
313- }
314-
315- return true;
316-}
317-
318-} // namespace Aeskulap
319
320=== removed directory '.pc/20_i18n_pt.patch'
321=== removed directory '.pc/20_i18n_pt.patch/po'
322=== removed file '.pc/20_i18n_pt.patch/po/pt.po'
323--- .pc/20_i18n_pt.patch/po/pt.po 2012-01-02 22:24:12 +0000
324+++ .pc/20_i18n_pt.patch/po/pt.po 1970-01-01 00:00:00 +0000
325@@ -1,591 +0,0 @@
326-# SOME DESCRIPTIVE TITLE.
327-# Copyright (C) YEAR Free Software Foundation, Inc.
328-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
329-#
330-#, fuzzy
331-msgid ""
332-msgstr ""
333-"Project-Id-Version: PACKAGE VERSION\n"
334-"Report-Msgid-Bugs-To: \n"
335-"POT-Creation-Date: 2007-05-10 22:33+0200\n"
336-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
337-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
338-"Language-Team: LANGUAGE <LL@li.org>\n"
339-"MIME-Version: 1.0\n"
340-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
341-"Content-Transfer-Encoding: ENCODING\n"
342-
343-#. DEFAULT CT WINDOWLEVELS
344-#.
345-#. (Thanks Dr. Grover Ronald Pardo Holzwarth)
346-#.
347-#. Abdomen W: 250 C: 50
348-#. Head W: 150 C: 50
349-#. Lung W: 2000 C: -550
350-#. Mediastinum W: 450 C: 50
351-#. Spine W: 300 C: 40
352-#. Vertebrae W: 2300 C: 530
353-#: ../configuration/aconfiguration.cpp:52
354-msgid "Abdomen"
355-msgstr ""
356-
357-#: ../configuration/aconfiguration.cpp:53
358-msgid "Head"
359-msgstr ""
360-
361-#: ../configuration/aconfiguration.cpp:54
362-msgid "Lung"
363-msgstr ""
364-
365-#: ../configuration/aconfiguration.cpp:55
366-msgid "Mediastinum"
367-msgstr ""
368-
369-#: ../configuration/aconfiguration.cpp:56
370-msgid "Spine"
371-msgstr ""
372-
373-#: ../configuration/aconfiguration.cpp:57
374-msgid "Vertebrae"
375-msgstr ""
376-
377-#: ../imagepool/netquery.cpp:112 ../imagepool/poolinstance.cpp:586
378-#: ../imagepool/poolinstance.cpp:609
379-msgid "no description"
380-msgstr ""
381-
382-#: ../widgets/aseriesmenu.cpp:45
383-#, c-format
384-msgid ""
385-"Series %li (%s)\n"
386-"%s"
387-msgstr ""
388-
389-#: ../widgets/aseriesmenu.cpp:48
390-#, c-format
391-msgid ""
392-"Series %li (%s)\n"
393-"No description"
394-msgstr ""
395-
396-#: ../widgets/seriesview.cpp:322 ../widgets/awindowleveltoolbutton.cpp:100
397-#: ../widgets/awindowleveltoolbutton.cpp:107
398-#: ../widgets/awindowleveltoolbutton.cpp:143
399-#: ../widgets/awindowleveltoolbutton.cpp:144
400-msgid "Custom"
401-msgstr ""
402-
403-#: ../widgets/adisplay.cpp:160
404-msgid "Acc:\n"
405-msgstr ""
406-
407-#: ../widgets/adisplay.cpp:162
408-msgid "Acq Tm: "
409-msgstr ""
410-
411-#: ../widgets/adisplay.cpp:175
412-#, c-format
413-msgid "Image: %i / %i"
414-msgstr ""
415-
416-#: ../widgets/adisplay.cpp:513 ../widgets/adisplay.cpp:565
417-#, c-format
418-msgid "%i mm"
419-msgstr ""
420-
421-#: ../widgets/studyview.cpp:110
422-msgid "Rearrange the series of the current study"
423-msgstr ""
424-
425-#: ../widgets/studyview.cpp:111
426-msgid "Display the series tiling menu"
427-msgstr ""
428-
429-#: ../widgets/studyview.cpp:120
430-msgid "Toggle single series mode"
431-msgstr ""
432-
433-#: ../widgets/studyview.cpp:121
434-msgid "Display the series selection menu"
435-msgstr ""
436-
437-#: ../widgets/studyview.cpp:129
438-msgid "Rearrange the images of the selected series"
439-msgstr ""
440-
441-#: ../widgets/studyview.cpp:130
442-msgid "Display the the image tiling menu"
443-msgstr ""
444-
445-#: ../widgets/studyview.cpp:139
446-msgid "Display references of the selected series"
447-msgstr ""
448-
449-#: ../widgets/studyview.cpp:143
450-msgid "Navigate through 3D views"
451-msgstr ""
452-
453-#: ../widgets/studyview.cpp:147
454-msgid "Display image values under the cursor"
455-msgstr ""
456-
457-#: ../widgets/studyview.cpp:156
458-msgid "Measurement tools"
459-msgstr ""
460-
461-#: ../widgets/studyview.cpp:784
462-msgid "new windowlevel"
463-msgstr ""
464-
465-#: ../widgets/adatefilter.cpp:44 ../widgets/adatefilter.cpp:49
466-#: ../widgets/adatefilter.cpp:91 ../widgets/adatefilter.cpp:97
467-msgid "None"
468-msgstr ""
469-
470-#: ../widgets/adatefilter.cpp:45 ../widgets/adatefilter.cpp:104
471-msgid "Today"
472-msgstr ""
473-
474-#: ../widgets/adatefilter.cpp:46 ../widgets/adatefilter.cpp:110
475-msgid "Yesterday"
476-msgstr ""
477-
478-#: ../widgets/adatefilter.cpp:47 ../widgets/adatefilter.cpp:116
479-msgid "Date"
480-msgstr ""
481-
482-#: ../widgets/adatefilter.cpp:48 ../widgets/adatefilter.cpp:125
483-msgid "Range"
484-msgstr ""
485-
486-#: ../widgets/adatefilter.cpp:177
487-msgid "Select date"
488-msgstr ""
489-
490-#: ../widgets/adatefilter.cpp:183
491-msgid "Select Enddate"
492-msgstr ""
493-
494-#: ../widgets/awindowleveltoolbutton.cpp:24
495-msgid "Invert windowlevel"
496-msgstr ""
497-
498-#: ../widgets/awindowleveltoolbutton.cpp:55
499-msgid "Add new windowlevel preset"
500-msgstr ""
501-
502-#: ../widgets/awindowleveltoolbutton.cpp:99
503-#: ../widgets/awindowleveltoolbutton.cpp:103
504-#: ../widgets/awindowleveltoolbutton.cpp:151
505-#: ../widgets/awindowleveltoolbutton.cpp:157
506-msgid "Default"
507-msgstr ""
508-
509-#: ../src/astockids.cpp:73
510-msgid "1 Image"
511-msgstr ""
512-
513-#: ../src/astockids.cpp:74
514-msgid "1x2 Images"
515-msgstr ""
516-
517-#: ../src/astockids.cpp:75
518-msgid "2x1 Images"
519-msgstr ""
520-
521-#: ../src/astockids.cpp:76
522-msgid "2x2 Images"
523-msgstr ""
524-
525-#: ../src/astockids.cpp:77
526-msgid "4x4 Images"
527-msgstr ""
528-
529-#: ../src/astockids.cpp:78
530-msgid "Single"
531-msgstr ""
532-
533-#: ../src/astockids.cpp:79
534-msgid "All"
535-msgstr ""
536-
537-#: ../src/astockids.cpp:80
538-msgid "1 Series"
539-msgstr ""
540-
541-#: ../src/astockids.cpp:81
542-msgid "2x1 Series"
543-msgstr ""
544-
545-#: ../src/astockids.cpp:82
546-msgid "2x2 Series"
547-msgstr ""
548-
549-#: ../src/astockids.cpp:83
550-msgid "3x2 Series"
551-msgstr ""
552-
553-#: ../src/astockids.cpp:84
554-msgid "3x3 Series"
555-msgstr ""
556-
557-#: ../src/astockids.cpp:85
558-msgid "4x4 Series"
559-msgstr ""
560-
561-#: ../src/astockids.cpp:86
562-msgid "Reference"
563-msgstr ""
564-
565-#: ../src/astockids.cpp:87
566-msgid "Delete item"
567-msgstr ""
568-
569-#: ../src/astockids.cpp:88
570-msgid "3D Cursor"
571-msgstr ""
572-
573-#: ../src/astockids.cpp:89
574-msgid "Value Picker"
575-msgstr ""
576-
577-#: ../src/astockids.cpp:90
578-msgid "Measure"
579-msgstr ""
580-
581-#: ../src/mainwindow.cpp:57 ../src/mainwindow.cpp:183
582-msgid "Open DICOM Image files"
583-msgstr ""
584-
585-#: ../src/mainwindow.cpp:117
586-msgid "Bring opened files to front"
587-msgstr ""
588-
589-#: ../src/mainwindow.cpp:125
590-msgid "DICOM files"
591-msgstr ""
592-
593-#: ../src/mainwindow.cpp:128
594-msgid "Any files"
595-msgstr ""
596-
597-#: ../src/mainwindow.cpp:131
598-msgid "DICOMDIR files"
599-msgstr ""
600-
601-#: ../src/mainwindow.cpp:155 ../src/aeskulap.glade.h:37
602-msgid "Open DICOMDIR"
603-msgstr ""
604-
605-#: ../src/mainwindow.cpp:247
606-msgid ""
607-"<span weight=\"bold\" size=\"larger\">Unable to receive the\n"
608-"requested images</span>\n"
609-"\n"
610-"The request was sent to the server but no response has been received."
611-msgstr ""
612-
613-#: ../src/studymanager.cpp:99
614-msgid "Patientsname"
615-msgstr ""
616-
617-#: ../src/studymanager.cpp:100
618-msgid "Birthdate"
619-msgstr ""
620-
621-#: ../src/studymanager.cpp:101 ../src/settings.cpp:151 ../src/settings.cpp:502
622-msgid "Description"
623-msgstr ""
624-
625-#: ../src/studymanager.cpp:102 ../src/aeskulap.glade.h:34
626-msgid "Modality"
627-msgstr ""
628-
629-#: ../src/studymanager.cpp:103
630-msgid "Date/Time"
631-msgstr ""
632-
633-#: ../src/studymanager.cpp:104
634-msgid "Station"
635-msgstr ""
636-
637-#: ../src/studymanager.cpp:105 ../src/aeskulap.glade.h:42
638-msgid "Server"
639-msgstr ""
640-
641-#: ../src/studymanager.cpp:127 ../src/settings.cpp:126
642-#: ../src/aeskulap.glade.h:29
643-msgid "Group"
644-msgstr ""
645-
646-#: ../src/studymanager.cpp:174
647-msgid "<span weight=\"bold\" size=\"larger\">No results for this query</span>"
648-msgstr ""
649-
650-#: ../src/studymanager.cpp:198
651-msgid "<span weight=\"bold\" size=\"larger\">No study or bad DICOMDIR</span>"
652-msgstr ""
653-
654-#: ../src/studymanager.cpp:277
655-#, c-format
656-msgid "Series %02i (1 Image)"
657-msgstr ""
658-
659-#: ../src/studymanager.cpp:280
660-#, c-format
661-msgid "Series %02i (%i Images)"
662-msgstr ""
663-
664-#: ../src/studymanager.cpp:283
665-#, c-format
666-msgid "Series %02i"
667-msgstr ""
668-
669-#: ../src/settings.cpp:122 ../src/aeskulap.glade.h:36
670-msgid "Name"
671-msgstr ""
672-
673-#: ../src/settings.cpp:123 ../src/aeskulap.glade.h:16
674-msgid "AET"
675-msgstr ""
676-
677-#: ../src/settings.cpp:124 ../src/aeskulap.glade.h:38
678-msgid "Port"
679-msgstr ""
680-
681-#: ../src/settings.cpp:125
682-msgid "Hostname"
683-msgstr ""
684-
685-#: ../src/settings.cpp:152
686-msgid "Center"
687-msgstr ""
688-
689-#: ../src/settings.cpp:153
690-msgid "Width"
691-msgstr ""
692-
693-#: ../src/settings.cpp:410
694-msgid ""
695-"<span weight=\"bold\" size=\"larger\">Echo test failed!</span>\n"
696-"\n"
697-msgstr ""
698-
699-#: ../src/settings.cpp:426
700-msgid "<span weight=\"bold\" size=\"larger\">Echo succeeded</span>"
701-msgstr ""
702-
703-#: ../src/aeskulap.glade.h:1
704-msgid "(C) 2005 Alexander Pipelka"
705-msgstr ""
706-
707-#: ../src/aeskulap.glade.h:2
708-msgid "<b>Accessionnumber:</b>"
709-msgstr ""
710-
711-#: ../src/aeskulap.glade.h:3
712-msgid "<b>Character Set</b>"
713-msgstr ""
714-
715-#: ../src/aeskulap.glade.h:4
716-msgid "<b>Date:</b>"
717-msgstr ""
718-
719-#: ../src/aeskulap.glade.h:5
720-msgid "<b>Details</b>"
721-msgstr ""
722-
723-#: ../src/aeskulap.glade.h:6
724-msgid "<b>Local DICOM Settings</b>"
725-msgstr ""
726-
727-#: ../src/aeskulap.glade.h:7
728-msgid "<b>Modality:</b>"
729-msgstr ""
730-
731-#: ../src/aeskulap.glade.h:8
732-msgid "<b>Name:</b>"
733-msgstr ""
734-
735-#: ../src/aeskulap.glade.h:9
736-msgid "<b>Patient ID:</b>"
737-msgstr ""
738-
739-#: ../src/aeskulap.glade.h:10
740-msgid "<b>Prescanning files ...</b>"
741-msgstr ""
742-
743-#: ../src/aeskulap.glade.h:11
744-msgid "<b>Servergroups</b>"
745-msgstr ""
746-
747-#: ../src/aeskulap.glade.h:12
748-msgid "<b>Stationname:</b>"
749-msgstr ""
750-
751-#: ../src/aeskulap.glade.h:13
752-msgid "<b>Study Description:</b>"
753-msgstr ""
754-
755-#: ../src/aeskulap.glade.h:14
756-msgid "<b>Study List</b>"
757-msgstr ""
758-
759-#: ../src/aeskulap.glade.h:15
760-msgid "<b>required</b>"
761-msgstr ""
762-
763-#: ../src/aeskulap.glade.h:17
764-msgid "Add windowlevel"
765-msgstr ""
766-
767-#: ../src/aeskulap.glade.h:18
768-msgid "Advanced query options"
769-msgstr ""
770-
771-#: ../src/aeskulap.glade.h:19
772-msgid "Aeskulap Viewer"
773-msgstr ""
774-
775-#: ../src/aeskulap.glade.h:20
776-msgid ""
777-"CT\n"
778-"CR"
779-msgstr ""
780-
781-#: ../src/aeskulap.glade.h:22
782-msgid "Center:"
783-msgstr ""
784-
785-#: ../src/aeskulap.glade.h:23
786-msgid "Clear"
787-msgstr ""
788-
789-#: ../src/aeskulap.glade.h:24
790-msgid "Clear Filter"
791-msgstr ""
792-
793-#: ../src/aeskulap.glade.h:25
794-msgid "DICOM Settings"
795-msgstr ""
796-
797-#: ../src/aeskulap.glade.h:26
798-msgid "Description:"
799-msgstr ""
800-
801-#: ../src/aeskulap.glade.h:27
802-msgid "Echotest"
803-msgstr ""
804-
805-#: ../src/aeskulap.glade.h:28
806-msgid "Fullscreen"
807-msgstr ""
808-
809-#: ../src/aeskulap.glade.h:30
810-msgid "IP / Hostname"
811-msgstr ""
812-
813-#: ../src/aeskulap.glade.h:31
814-msgid "Local AET"
815-msgstr ""
816-
817-#: ../src/aeskulap.glade.h:32
818-msgid "Medical image viewer and DICOM network client\n"
819-msgstr ""
820-
821-#: ../src/aeskulap.glade.h:35
822-msgid "Modality:"
823-msgstr ""
824-
825-#: ../src/aeskulap.glade.h:39
826-msgid "Presets"
827-msgstr ""
828-
829-#: ../src/aeskulap.glade.h:40
830-msgid "Scanning files"
831-msgstr ""
832-
833-#: ../src/aeskulap.glade.h:41
834-msgid "Search"
835-msgstr ""
836-
837-#: ../src/aeskulap.glade.h:43
838-msgid "Servers"
839-msgstr ""
840-
841-#: ../src/aeskulap.glade.h:44
842-msgid "Settings"
843-msgstr ""
844-
845-#: ../src/aeskulap.glade.h:45
846-msgid "Specific Characterset"
847-msgstr ""
848-
849-#: ../src/aeskulap.glade.h:46
850-msgid "Study Manager"
851-msgstr ""
852-
853-#: ../src/aeskulap.glade.h:47
854-msgid ""
855-"The Aeskulap source code is licensed under the following terms:\n"
856-"\n"
857-"Aesuklap main application:\n"
858-"GPL\n"
859-"\n"
860-"ImagePool DICOM Bridge Library:\n"
861-"LGPL\n"
862-"\n"
863-"DCMTK - OFFIS DICOM Toolkit:\n"
864-"BSD/MIT"
865-msgstr ""
866-
867-#: ../src/aeskulap.glade.h:57
868-msgid "Width:"
869-msgstr ""
870-
871-#: ../src/aeskulap.glade.h:58
872-msgid "Windowlevels"
873-msgstr ""
874-
875-#: ../src/aeskulap.glade.h:59
876-msgid ""
877-"XA\n"
878-"CT\n"
879-"CR\n"
880-"NM\n"
881-"MR\n"
882-"SC\n"
883-msgstr ""
884-
885-#: ../src/aeskulap.glade.h:66
886-msgid "_DicomDir"
887-msgstr ""
888-
889-#: ../src/aeskulap.glade.h:67
890-msgid "_Edit"
891-msgstr ""
892-
893-#: ../src/aeskulap.glade.h:68
894-msgid "_File"
895-msgstr ""
896-
897-#: ../src/aeskulap.glade.h:69
898-msgid "_Help"
899-msgstr ""
900-
901-#: ../src/aeskulap.glade.h:70
902-msgid "_View"
903-msgstr ""
904-
905-#: ../src/aeskulap.glade.h:71
906-msgid "non-standard relational queries"
907-msgstr ""
908-
909-#: ../src/aeskulap.glade.h:72
910-msgid "prefer lossy JPEG compression"
911-msgstr ""
912-
913-#. TRANSLATORS: Replace this string with your names, one name per line.
914-#: ../src/aeskulap.glade.h:74
915-msgid "translator-credits"
916-msgstr ""
917
918=== removed directory '.pc/30_as_needed.patch'
919=== removed directory '.pc/30_as_needed.patch/src'
920=== removed file '.pc/30_as_needed.patch/src/Makefile.am'
921--- .pc/30_as_needed.patch/src/Makefile.am 2012-01-02 22:24:12 +0000
922+++ .pc/30_as_needed.patch/src/Makefile.am 1970-01-01 00:00:00 +0000
923@@ -1,85 +0,0 @@
924-bin_PROGRAMS = aeskulap
925-
926-aeskulap_SOURCES = \
927- binreloc.h \
928- binreloc.c \
929- abusycursor.h \
930- abusycursor.cpp \
931- astockids.cpp \
932- astockids.h \
933- aiconfactory.cpp \
934- aiconfactory.h \
935- mainwindow.cpp \
936- mainwindow.h \
937- studymanager.cpp \
938- studymanager.h \
939- settings.cpp \
940- settings.h \
941- prescandialog.cpp \
942- prescandialog.h \
943- aboutdialog.h \
944- aboutdialog.cpp \
945- windowleveldialog.h \
946- windowleveldialog.cpp \
947- main.cpp
948-
949-if BUILD_NOT_MINGW32
950-ICONOBJ =
951-else
952-ICONOBJ = icon.o
953-endif
954-
955-icon.rc:
956- echo "IDI_ICON1 ICON DISCARDABLE \"$(top_srcdir)/packaging/win32/aeskulap.ico\"" > icon.rc
957-
958-icon.o: icon.rc
959- $(target_alias)-windres -J rc -i icon.rc -o icon.o
960-
961-aeskulap_LDADD = \
962- $(ICONOBJ) \
963- $(GTKMM_LIBS) \
964- $(GLADEMM_LIBS) \
965- $(GTHREAD_LIBS) \
966- ../widgets/libgtkdicom.la \
967- ../imagepool/libimagepool.la \
968- ../configuration/libconfiguration.la \
969- $(GCONFMM_LIBS) \
970- $(DCMTK_LIBS)
971-
972-aeskulap_LDFLAGS = \
973- -Wl,-rpath,${prefix}/lib/aeskulap $(LDFLAGS_MINGW32)
974-
975-if BUILD_NOT_MINGW32
976-
977-schemadir = @GCONF_SCHEMA_FILE_DIR@
978-schema_DATA = aeskulap.schemas
979-
980-@INTLTOOL_SCHEMAS_RULE@
981-
982-if GCONF_SCHEMAS_INSTALL
983-install-data-local:
984- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
985-endif
986-endif
987-
988-INCLUDES = \
989- -DAESKULAP_DATADIR=\""$(datadir)"\" \
990- -DLOCALEDIR=\""$(datadir)/locale"\" \
991- $(GTKMM_CFLAGS) \
992- $(GLADEMM_CFLAGS) \
993- $(GCONFMM_CFLAGS) \
994- $(DCMTK_CFLAGS) \
995- -I$(top_srcdir)/configuration \
996- -I$(top_srcdir)/widgets \
997- -I$(top_srcdir)/imagepool
998-
999-gladedir = $(datadir)/aeskulap/glade
1000-glade_DATA = aeskulap.glade
1001-
1002-desktopdir = $(datadir)/applications
1003-desktop_DATA = aeskulap.desktop
1004-
1005-EXTRA_DIST = \
1006- aeskulap.glade \
1007- aeskulap.desktop \
1008- $(schema_DATA)
1009
1010=== removed directory '.pc/DcmElement_has_no_member_error.patch'
1011=== removed directory '.pc/DcmElement_has_no_member_error.patch/imagepool'
1012=== removed file '.pc/DcmElement_has_no_member_error.patch/imagepool/poolassociation.h'
1013--- .pc/DcmElement_has_no_member_error.patch/imagepool/poolassociation.h 2012-01-02 22:24:12 +0000
1014+++ .pc/DcmElement_has_no_member_error.patch/imagepool/poolassociation.h 1970-01-01 00:00:00 +0000
1015@@ -1,200 +0,0 @@
1016-/*
1017- Aeskulap ImagePool - DICOM abstraction library
1018- Copyright (C) 2005 Alexander Pipelka
1019-
1020- This library is free software; you can redistribute it and/or
1021- modify it under the terms of the GNU Library General Public
1022- License as published by the Free Software Foundation; either
1023- version 2 of the License, or (at your option) any later version.
1024-
1025- This library is distributed in the hope that it will be useful,
1026- but WITHOUT ANY WARRANTY; without even the implied warranty of
1027- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1028- Library General Public License for more details.
1029-
1030- You should have received a copy of the GNU Library General Public
1031- License along with this library; if not, write to the Free
1032- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1033-
1034- Alexander Pipelka
1035- pipelka@teleweb.at
1036-
1037- Last Update: $Author$
1038- Update Date: $Date$
1039- Source File: $Source$
1040- CVS/RCS Revision: $Revision$
1041- Status: $State$
1042-*/
1043-
1044-#ifndef IMAGEPOOL_ASSOCIATION_H
1045-#define IMAGEPOOL_ASSOCIATION_H
1046-
1047-// dcmtk includes
1048-#include "dcmtk/config/osconfig.h"
1049-#include <dcmtk/dcmnet/assoc.h>
1050-#include <dcmtk/dcmnet/cond.h>
1051-#include <dcmtk/dcmnet/dimse.h>
1052-#include <dcmtk/dcmdata/dcfilefo.h>
1053-
1054-class Network;
1055-
1056-class Association
1057-{
1058-public:
1059-
1060- /**
1061- Constructors
1062- */
1063- Association();
1064- virtual ~Association();
1065-
1066- /**
1067- Create the association object (connect through DicomNetwork::Connect(..) )
1068- */
1069- void Create(const std::string& title, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax = NULL);
1070-
1071- /**
1072- Connect the association to a dicom network
1073- */
1074- CONDITION Connect(Network* network, int lossy = 0);
1075-
1076- void Destroy();
1077-
1078- /**
1079- Drop the association
1080- */
1081- CONDITION Drop(CONDITION cond=DIMSE_NORMAL);
1082-
1083- /**
1084- Send a dataset through the association (C-Store)
1085- */
1086- virtual CONDITION SendObject(DcmDataset* dataset);
1087-
1088- /**
1089- Send a fileformat object through the association (C-Store)
1090- */
1091- virtual CONDITION SendObject(DcmFileFormat* dcmff);
1092-
1093- /**
1094- Send a C-Echo request through the association
1095- */
1096- bool SendEchoRequest();
1097-
1098- /**
1099- Return the DicomNetwork this association is connected to
1100- */
1101- Network* GetNetwork();
1102-
1103- /**
1104- add a query key to a dataset
1105- */
1106-
1107- static bool AddKey(DcmItem *query, const DcmTagKey& tag, const char* value=NULL);
1108-
1109- static bool AddKey(DcmItem *query, const DcmTagKey& tag, int value);
1110- static bool AddKey(DcmItem *query, const DcmTagKey& tag, double value, const char* format = "%lf");
1111-
1112- static bool AddKey(DcmDataset *query, const DcmTagKey& tag, const char* value=NULL);
1113-
1114- //template< class T >
1115- static bool AddCustomKey(DcmItem* query, const DcmTagKey& t, const char* value) {
1116- DcmTag tag(t);
1117- Uint16 g = tag.getGTag();
1118- Uint16 e = tag.getETag();
1119-
1120- if (tag.error() != EC_Normal) {
1121- printf("unknown tag: (%04x,%04x)", g, e);
1122- return false;
1123- }
1124-
1125- DcmElement *elem = newDicomElement(tag);
1126- if (elem == NULL) {
1127- printf("cannot create element for tag: (%04x,%04x)", g, e);
1128- return false;
1129- }
1130-
1131- if(value != NULL) {
1132- if (strlen(value) > 0) {
1133- elem->putString(value);
1134-
1135- if (elem->error() != EC_Normal) {
1136- printf("cannot put tag value: (%04x,%04x)=\"%s\"", g, e, value);
1137- return false;
1138- }
1139- }
1140- }
1141-
1142- delete query->remove(t);
1143- query->insert(elem, OFTrue);
1144-
1145- return true;
1146- }
1147-
1148- static bool AddKey(DcmDataset *query, const DcmTagKey& tag, int value);
1149- static bool AddKey(DcmDataset *query, const DcmTagKey& tag, double value, const char* format = "%lf");
1150-
1151- /**
1152- get a key from the dataset
1153- */
1154- static const char* GetKey(DcmDataset* query, const DcmTagKey& tag);
1155-
1156- /**
1157- add a query level to a dataset
1158- */
1159- static bool AddQueryLevel(DcmDataset* query, const std::string& level);
1160-
1161- const std::string& GetOurAET();
1162-
1163- void SetTimeout(int t);
1164-
1165- int GetTimeout();
1166-
1167- void SetCompressionQuality(int q);
1168-
1169- int GetCompressionQuality();
1170-
1171- void SetProposeCompression(bool propose);
1172-
1173- bool GetProposeCompression();
1174-
1175- void SetAcceptLossyImages(bool lossy);
1176-
1177-protected:
1178-
1179- /**
1180- Callback function to add user defined presentation context to association parameters
1181- */
1182- virtual void OnAddPresentationContext(T_ASC_Parameters *params, const char* transferSyntaxList[], int transferSyntaxListCount);
1183-
1184- /**
1185- Protected data
1186- */
1187-
1188- char* m_abstractSyntax;
1189- std::string m_calledAET;
1190- std::string m_calledPeer;
1191- std::string m_ourAET;
1192-
1193- int m_calledPort;
1194- int m_timeout;
1195- bool m_accept_lossy;
1196-
1197- T_ASC_Association* assoc;
1198- T_ASC_PresentationContextID presId;
1199- DIC_UI sopClass;
1200- DIC_UI sopInstance;
1201- DIC_US msgId;
1202-
1203-protected:
1204-
1205- /**
1206- Private data
1207- */
1208- Network* dcmNet;
1209- int m_CompressionQuality;
1210- bool m_ProposeCompression;
1211-
1212- friend class Network;
1213-};
1214-
1215-#endif
1216
1217=== removed file '.pc/applied-patches'
1218--- .pc/applied-patches 2012-01-02 22:24:12 +0000
1219+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
1220@@ -1,10 +0,0 @@
1221-10_desktop.patch
1222-20_i18n_pt.patch
1223-20_gcc4.4.patch
1224-circular_svg_icon.patch
1225-findAndCopyElement.patch
1226-DcmElement_has_no_member_error.patch
1227-patientsname.patch
1228-dcmdata_debug.patch
1229-oflog.patch
1230-30_as_needed.patch
1231
1232=== removed directory '.pc/circular_svg_icon.patch'
1233=== removed directory '.pc/circular_svg_icon.patch/pixmaps'
1234=== removed file '.pc/circular_svg_icon.patch/pixmaps/aeskulap.svg'
1235--- .pc/circular_svg_icon.patch/pixmaps/aeskulap.svg 2012-01-02 22:24:12 +0000
1236+++ .pc/circular_svg_icon.patch/pixmaps/aeskulap.svg 1970-01-01 00:00:00 +0000
1237@@ -1,169 +0,0 @@
1238-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1239-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
1240-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
1241-<!-- Created with Inkscape (http://www.inkscape.org/) -->
1242-<svg
1243- width="210mm"
1244- height="297mm"
1245- id="svg1"
1246- sodipodi:version="0.32"
1247- inkscape:version="0.40"
1248- sodipodi:docbase="/home/pipelka/workspace/aeskulap/pixmaps"
1249- sodipodi:docname="aeskulap.svg"
1250- xmlns="http://www.w3.org/2000/svg"
1251- xmlns:cc="http://web.resource.org/cc/"
1252- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
1253- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
1254- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1255- xmlns:dc="http://purl.org/dc/elements/1.1/"
1256- xmlns:xlink="http://www.w3.org/1999/xlink">
1257- <defs
1258- id="defs3">
1259- <linearGradient
1260- id="linearGradient1891">
1261- <stop
1262- style="stop-color:#d5bb00;stop-opacity:1.0000000;"
1263- offset="0.0000000"
1264- id="stop1892" />
1265- <stop
1266- style="stop-color:#d59c00;stop-opacity:1.0000000;"
1267- offset="1.0000000"
1268- id="stop1893" />
1269- </linearGradient>
1270- <linearGradient
1271- gradientTransform="matrix(1.553900,0.000000,0.000000,0.643542,-1032.482,-655.0804)"
1272- gradientUnits="userSpaceOnUse"
1273- id="linearGradient1078"
1274- inkscape:collect="always"
1275- x1="213.82799"
1276- x2="214.59154"
1277- xlink:href="#linearGradient1702"
1278- y1="183.48366"
1279- y2="463.47311" />
1280- <linearGradient
1281- gradientUnits="userSpaceOnUse"
1282- id="linearGradient1077"
1283- inkscape:collect="always"
1284- x1="522.94183"
1285- x2="522.94183"
1286- xlink:href="#linearGradient1697"
1287- y1="469.49918"
1288- y2="505.08450" />
1289- <linearGradient
1290- gradientUnits="userSpaceOnUse"
1291- id="linearGradient1076"
1292- inkscape:collect="always"
1293- x1="520.57166"
1294- x2="520.57166"
1295- xlink:href="#linearGradient1697"
1296- y1="506.28723"
1297- y2="466.27850" />
1298- <radialGradient
1299- cx="522.89532"
1300- cy="481.86633"
1301- fx="522.89911"
1302- fy="473.03323"
1303- gradientUnits="userSpaceOnUse"
1304- id="radialGradient1706"
1305- inkscape:collect="always"
1306- r="15.301119"
1307- xlink:href="#linearGradient1702" />
1308- <linearGradient
1309- id="linearGradient1697">
1310- <stop
1311- id="stop1698"
1312- offset="0.0000000"
1313- style="stop-color:#0e56db;stop-opacity:1.0000000;" />
1314- <stop
1315- id="stop1699"
1316- offset="1.0000000"
1317- style="stop-color:#071176;stop-opacity:1.0000000;" />
1318- </linearGradient>
1319- <linearGradient
1320- id="linearGradient1702">
1321- <stop
1322- id="stop1703"
1323- offset="0.0000000"
1324- style="stop-color:#ffffff;stop-opacity:0.69072163;" />
1325- <stop
1326- id="stop1704"
1327- offset="1.0000000"
1328- style="stop-color:#ffffff;stop-opacity:0.0000000;" />
1329- </linearGradient>
1330- </defs>
1331- <sodipodi:namedview
1332- id="base"
1333- pagecolor="#ffffff"
1334- bordercolor="#666666"
1335- borderopacity="1.0"
1336- inkscape:pageopacity="0.0"
1337- inkscape:pageshadow="2"
1338- inkscape:zoom="0.43415836"
1339- inkscape:cx="305.25953"
1340- inkscape:cy="417.84947"
1341- inkscape:current-layer="svg1"
1342- inkscape:window-width="1005"
1343- inkscape:window-height="855"
1344- inkscape:window-x="0"
1345- inkscape:window-y="49" />
1346- <metadata
1347- id="metadata4">
1348- <rdf:RDF
1349- id="RDF5">
1350- <cc:Work
1351- rdf:about=""
1352- id="Work6">
1353- <dc:format
1354- id="format7">image/svg+xml</dc:format>
1355- <dc:type
1356- id="type9"
1357- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1358- </cc:Work>
1359- </rdf:RDF>
1360- </metadata>
1361- <g
1362- inkscape:label="Layer 1"
1363- inkscape:groupmode="layer"
1364- id="layer1" />
1365- <g
1366- id="g1888"
1367- inkscape:groupmode="layer"
1368- inkscape:label="Layer 1"
1369- transform="translate(1075.371,877.7630)">
1370- <path
1371- d="M 544.06634 487.06226 A 20.783747 20.783747 0 1 1 502.49885,487.06226 A 20.783747 20.783747 0 1 1 544.06634 487.06226 z"
1372- id="path1070"
1373- sodipodi:cx="523.28259"
1374- sodipodi:cy="487.06226"
1375- sodipodi:rx="20.783747"
1376- sodipodi:ry="20.783747"
1377- sodipodi:type="arc"
1378- style="fill:url(#linearGradient1076);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient1077);stroke-width:1.3644532;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
1379- transform="matrix(9.161179,0.000000,0.000000,9.161179,-5492.090,-4820.105)"
1380- inkscape:export-filename="/home/pipelka/workspace/aeskulap/pixmaps/aeskulap.png"
1381- inkscape:export-xdpi="14.650000"
1382- inkscape:export-ydpi="14.650000" />
1383- <path
1384- d="M -559.89071,-408.19438 C -515.52353,-409.16117 -572.29085,-531.34724 -695.57170,-531.99715 C -830.13322,-532.68427 -857.66765,-421.03579 -836.29116,-418.99993 C -836.29116,-418.99993 -799.42699,-413.93732 -764.35158,-404.14387 C -707.87893,-388.21306 -638.80245,-417.21309 -611.58284,-421.42745 C -581.24034,-426.12533 -564.20941,-406.03503 -559.89071,-408.19438 z "
1385- id="path1713"
1386- sodipodi:nodetypes="cccccc"
1387- style="opacity:0.89999998;fill:url(#linearGradient1078);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
1388- inkscape:export-filename="/home/pipelka/workspace/aeskulap/pixmaps/aeskulap.png"
1389- inkscape:export-xdpi="14.650000"
1390- inkscape:export-ydpi="14.650000" />
1391- </g>
1392- <path
1393- d="M 376.23352,653.92799 C 365.35477,634.39777 364.92759,623.55866 374.42773,608.10909 L 379.81899,599.34159 L 368.10038,590.13005 C 350.09449,575.97632 344.11730,566.87538 344.11730,553.61294 C 344.11730,542.70635 350.43846,528.68011 355.35365,528.68011 C 356.53235,528.68011 357.49669,527.43946 357.49669,525.92311 C 357.49669,524.40677 351.72686,522.16158 344.67477,520.93382 C 328.52272,518.12173 319.76345,511.91966 319.62256,503.19542 C 319.52856,497.37443 328.36685,490.59777 345.67347,483.22118 C 359.01096,477.53635 363.87582,474.23027 361.71420,472.32013 C 360.00779,470.81224 355.35043,470.41249 351.36446,471.43181 C 347.19354,472.49842 344.11730,471.98161 344.11730,470.21428 C 344.11730,468.52532 339.35092,467.09734 333.52528,467.04098 C 313.81690,466.85032 310.39727,466.49275 307.93359,464.36504 C 306.58161,463.19743 302.52339,461.91760 298.91531,461.52097 C 295.30722,461.12435 290.86883,458.72286 289.05219,456.18432 C 286.13483,452.10764 287.00861,451.31075 296.53660,449.35852 C 311.09103,446.37639 325.11224,437.39619 335.30479,424.52855 C 353.47310,401.59191 359.05204,400.02191 363.52642,416.58658 C 365.70666,424.65810 374.75029,433.54079 377.36663,430.18052 C 377.87035,429.53362 376.43871,424.22023 374.18525,418.37298 C 370.31056,408.31902 370.29390,407.30260 373.87833,399.65816 C 378.43520,389.93982 388.42610,388.75230 393.94443,397.27312 C 398.65813,404.55148 398.64076,412.90106 393.89673,420.22627 C 388.17090,429.06754 393.34229,434.68846 400.86523,427.80044 C 403.99431,424.93545 406.55450,421.22146 406.55450,419.54716 C 406.55450,417.87285 408.58439,413.66640 411.06540,410.19948 C 416.48436,402.62709 420.20055,404.66887 435.54317,423.64831 C 447.39989,438.31554 459.34174,446.16559 474.30565,449.12908 C 484.08142,451.06510 484.84552,451.77303 481.78123,456.05504 C 479.90398,458.67828 475.50575,461.14351 472.00742,461.53333 C 468.50909,461.92315 463.88854,463.31972 461.73950,464.63683 C 459.59050,465.95394 455.38729,466.17410 452.39911,465.12607 C 449.41087,464.07804 446.29979,464.72687 445.48555,466.56790 C 444.58403,468.60629 440.69614,469.13404 435.54317,467.91749 C 430.29327,466.67805 426.50520,467.22228 425.56360,469.35125 C 424.65243,471.41144 421.09853,472.01009 416.67050,470.84929 C 412.43657,469.73936 408.68511,470.29508 407.86295,472.15400 C 407.00183,474.10104 412.90152,478.04851 422.65939,482.05427 C 442.18282,490.06891 448.92256,495.63703 448.92256,503.75185 C 448.92256,512.22777 440.96578,518.57861 427.18104,521.10518 C 420.74222,522.28534 415.47409,523.93683 415.47409,524.77514 C 415.47409,525.61347 418.48444,531.09047 422.16378,536.94626 C 429.44967,548.54200 430.21218,553.55503 426.26973,563.94032 C 423.27487,571.82929 418.99143,576.48599 402.64679,589.62178 L 390.79228,599.14892 L 395.38927,606.55556 C 397.91760,610.62922 400.54444,617.55972 401.22672,621.95668 C 401.90899,626.35364 402.86220,631.73527 403.34504,633.91586 C 404.53137,639.27372 389.12037,662.71322 384.55351,662.49707 C 382.54992,662.40225 378.80594,658.54616 376.23352,653.92799 z M 399.86480,631.75063 C 399.86480,624.79624 391.49240,606.58091 388.29596,606.58091 C 387.30013,606.58091 386.48541,618.54852 386.48541,633.17560 L 386.48541,659.77030 L 393.17511,649.12341 C 396.85445,643.26762 399.86480,635.44987 399.86480,631.75063 z M 384.09874,635.22030 C 384.01256,625.46699 383.15345,614.68259 382.18969,611.25495 C 380.58750,605.55712 380.02332,605.95779 375.60801,615.92900 C 370.46666,627.53982 370.76451,636.70520 376.69980,649.52564 C 381.62762,660.16980 384.27404,655.05312 384.09874,635.22030 z M 382.02562,561.39845 C 382.02562,531.96443 381.99414,531.79614 376.49596,531.79614 C 366.69182,531.79614 353.10149,541.25786 351.70027,549.05913 C 349.43054,561.69620 352.94994,568.75752 367.10686,579.97095 C 374.69895,585.98448 381.16152,590.92627 381.46811,590.95270 C 381.77474,590.97912 382.02562,577.67971 382.02562,561.39845 z M 403.43502,579.79468 C 418.20137,568.85921 419.93389,566.53867 419.93389,557.69602 C 419.93389,545.45208 416.00161,538.52598 407.08571,535.06589 C 388.93792,528.02308 388.71531,528.32334 388.71531,559.84043 C 388.71531,575.26479 389.56929,587.88472 390.61309,587.88472 C 391.65685,587.88472 397.42674,584.24420 403.43502,579.79468 z M 381.18940,509.59441 C 380.42286,504.23873 379.79572,493.02102 379.79572,484.66616 C 379.79572,476.31130 378.80407,469.47550 377.59207,469.47550 C 376.38012,469.47550 375.62749,472.49995 375.91968,476.19649 C 376.39605,482.22400 374.15003,483.75707 354.15187,491.05468 C 324.25210,501.96552 324.25210,506.67857 354.15187,513.55219 C 384.83035,520.60483 382.80761,520.90092 381.18940,509.59441 z M 424.21080,512.05480 C 432.08213,510.05891 438.91866,506.75880 439.40304,504.72125 C 440.27237,501.06460 419.18534,490.89677 401.53724,486.46294 C 392.80614,484.26939 390.67169,479.97040 396.70689,476.73415 C 399.55054,475.20932 399.65918,474.32690 397.26440,472.20561 C 391.61472,467.20114 390.94521,469.57335 390.94521,494.59468 L 390.94521,519.71387 L 400.42227,517.69879 C 405.63464,516.59049 416.33948,514.05070 424.21080,512.05480 z "
1394- id="path1912"
1395- style="opacity:0.37769786;fill:#161618;fill-opacity:1.0000000;fill-rule:nonzero"
1396- inkscape:export-filename="/home/pipelka/workspace/aeskulap/pixmaps/aeskulap.png"
1397- inkscape:export-xdpi="14.650000"
1398- inkscape:export-ydpi="14.650000" />
1399- <path
1400- d="M 366.23352,646.42799 C 355.35477,626.89777 354.92759,616.05866 364.42773,600.60909 L 369.81899,591.84159 L 358.10038,582.63005 C 340.09449,568.47632 334.11730,559.37538 334.11730,546.11294 C 334.11730,535.20635 340.43846,521.18011 345.35365,521.18011 C 346.53235,521.18011 347.49669,519.93946 347.49669,518.42311 C 347.49669,516.90677 341.72686,514.66158 334.67477,513.43382 C 318.52272,510.62173 309.76345,504.41966 309.62256,495.69542 C 309.52856,489.87443 318.36685,483.09777 335.67347,475.72118 C 349.01096,470.03635 353.87582,466.73027 351.71420,464.82013 C 350.00779,463.31224 345.35043,462.91249 341.36446,463.93181 C 337.19354,464.99842 334.11730,464.48161 334.11730,462.71428 C 334.11730,461.02532 329.35092,459.59734 323.52528,459.54098 C 303.81690,459.35032 300.39727,458.99275 297.93359,456.86504 C 296.58161,455.69743 292.52339,454.41760 288.91531,454.02097 C 285.30722,453.62435 280.86883,451.22286 279.05219,448.68432 C 276.13483,444.60764 277.00861,443.81075 286.53660,441.85852 C 301.09103,438.87639 315.11224,429.89619 325.30479,417.02855 C 343.47310,394.09191 349.05204,392.52191 353.52642,409.08658 C 355.70666,417.15810 364.75029,426.04079 367.36663,422.68052 C 367.87035,422.03362 366.43871,416.72023 364.18525,410.87298 C 360.31056,400.81902 360.29390,399.80260 363.87833,392.15816 C 368.43520,382.43982 378.42610,381.25230 383.94443,389.77312 C 388.65813,397.05148 388.64076,405.40106 383.89673,412.72627 C 378.17090,421.56754 383.34229,427.18846 390.86523,420.30044 C 393.99431,417.43545 396.55450,413.72146 396.55450,412.04716 C 396.55450,410.37285 398.58439,406.16640 401.06540,402.69948 C 406.48436,395.12709 410.20055,397.16887 425.54317,416.14831 C 437.39989,430.81554 449.34174,438.66559 464.30565,441.62908 C 474.08142,443.56510 474.84552,444.27303 471.78123,448.55504 C 469.90398,451.17828 465.50575,453.64351 462.00742,454.03333 C 458.50909,454.42315 453.88854,455.81972 451.73950,457.13683 C 449.59050,458.45394 445.38729,458.67410 442.39911,457.62607 C 439.41087,456.57804 436.29979,457.22687 435.48555,459.06790 C 434.58403,461.10629 430.69614,461.63404 425.54317,460.41749 C 420.29327,459.17805 416.50520,459.72228 415.56360,461.85125 C 414.65243,463.91144 411.09853,464.51009 406.67050,463.34929 C 402.43657,462.23936 398.68511,462.79508 397.86295,464.65400 C 397.00183,466.60104 402.90152,470.54851 412.65939,474.55427 C 432.18282,482.56891 438.92256,488.13703 438.92256,496.25185 C 438.92256,504.72777 430.96578,511.07861 417.18104,513.60518 C 410.74222,514.78534 405.47409,516.43683 405.47409,517.27514 C 405.47409,518.11347 408.48444,523.59047 412.16378,529.44626 C 419.44967,541.04200 420.21218,546.05503 416.26973,556.44032 C 413.27487,564.32929 408.99143,568.98599 392.64679,582.12178 L 380.79228,591.64892 L 385.38927,599.05556 C 387.91760,603.12922 390.54444,610.05972 391.22672,614.45668 C 391.90899,618.85364 392.86220,624.23527 393.34504,626.41586 C 394.53137,631.77372 379.12037,655.21322 374.55351,654.99707 C 372.54992,654.90225 368.80594,651.04616 366.23352,646.42799 z M 389.86480,624.25063 C 389.86480,617.29624 381.49240,599.08091 378.29596,599.08091 C 377.30013,599.08091 376.48541,611.04852 376.48541,625.67560 L 376.48541,652.27030 L 383.17511,641.62341 C 386.85445,635.76762 389.86480,627.94987 389.86480,624.25063 z M 374.09874,627.72030 C 374.01256,617.96699 373.15345,607.18259 372.18969,603.75495 C 370.58750,598.05712 370.02332,598.45779 365.60801,608.42900 C 360.46666,620.03982 360.76451,629.20520 366.69980,642.02564 C 371.62762,652.66980 374.27404,647.55312 374.09874,627.72030 z M 372.02562,553.89845 C 372.02562,524.46443 371.99414,524.29614 366.49596,524.29614 C 356.69182,524.29614 343.10149,533.75786 341.70027,541.55913 C 339.43054,554.19620 342.94994,561.25752 357.10686,572.47095 C 364.69895,578.48448 371.16152,583.42627 371.46811,583.45270 C 371.77474,583.47912 372.02562,570.17971 372.02562,553.89845 z M 393.43502,572.29468 C 408.20137,561.35921 409.93389,559.03867 409.93389,550.19602 C 409.93389,537.95208 406.00161,531.02598 397.08571,527.56589 C 378.93792,520.52308 378.71531,520.82334 378.71531,552.34043 C 378.71531,567.76479 379.56929,580.38472 380.61309,580.38472 C 381.65685,580.38472 387.42674,576.74420 393.43502,572.29468 z M 371.18940,502.09441 C 370.42286,496.73873 369.79572,485.52102 369.79572,477.16616 C 369.79572,468.81130 368.80407,461.97550 367.59207,461.97550 C 366.38012,461.97550 365.62749,464.99995 365.91968,468.69649 C 366.39605,474.72400 364.15003,476.25707 344.15187,483.55468 C 314.25210,494.46552 314.25210,499.17857 344.15187,506.05219 C 374.83035,513.10483 372.80761,513.40092 371.18940,502.09441 z M 414.21080,504.55480 C 422.08213,502.55891 428.91866,499.25880 429.40304,497.22125 C 430.27237,493.56460 409.18534,483.39677 391.53724,478.96294 C 382.80614,476.76939 380.67169,472.47040 386.70689,469.23415 C 389.55054,467.70932 389.65918,466.82690 387.26440,464.70561 C 381.61472,459.70114 380.94521,462.07335 380.94521,487.09468 L 380.94521,512.21387 L 390.42227,510.19879 C 395.63464,509.09049 406.33948,506.55070 414.21080,504.55480 z "
1401- id="path1103"
1402- style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;"
1403- inkscape:export-filename="/home/pipelka/workspace/aeskulap/pixmaps/aeskulap.png"
1404- inkscape:export-xdpi="14.650000"
1405- inkscape:export-ydpi="14.650000" />
1406-</svg>
1407
1408=== removed directory '.pc/dcmdata_debug.patch'
1409=== removed directory '.pc/dcmdata_debug.patch/imagepool'
1410=== removed file '.pc/dcmdata_debug.patch/imagepool/poolfindassociation.cpp'
1411--- .pc/dcmdata_debug.patch/imagepool/poolfindassociation.cpp 2012-01-02 22:24:12 +0000
1412+++ .pc/dcmdata_debug.patch/imagepool/poolfindassociation.cpp 1970-01-01 00:00:00 +0000
1413@@ -1,143 +0,0 @@
1414-/*
1415- Aeskulap ImagePool - DICOM abstraction library
1416- Copyright (C) 2005 Alexander Pipelka
1417-
1418- This library is free software; you can redistribute it and/or
1419- modify it under the terms of the GNU Library General Public
1420- License as published by the Free Software Foundation; either
1421- version 2 of the License, or (at your option) any later version.
1422-
1423- This library is distributed in the hope that it will be useful,
1424- but WITHOUT ANY WARRANTY; without even the implied warranty of
1425- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1426- Library General Public License for more details.
1427-
1428- You should have received a copy of the GNU Library General Public
1429- License along with this library; if not, write to the Free
1430- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1431-
1432- Alexander Pipelka
1433- pipelka@teleweb.at
1434-
1435- Last Update: $Author$
1436- Update Date: $Date$
1437- Source File: $Source$
1438- CVS/RCS Revision: $Revision$
1439- Status: $State$
1440-*/
1441-
1442-#include "dcmtk/dcmdata/dcdebug.h"
1443-#include "poolfindassociation.h"
1444-
1445-
1446-FindAssociation::FindAssociation() {
1447- Association::m_abstractSyntax = UID_FINDPatientRootQueryRetrieveInformationModel;
1448- maxResults = 400;
1449- bPushResults = true;
1450-}
1451-
1452-FindAssociation::~FindAssociation() {
1453- DeleteResultStack();
1454-}
1455-
1456-CONDITION FindAssociation::findSCU(T_ASC_Association *assoc, DcmDataset *query) {
1457- CONDITION cond;
1458- DIC_US msgId = assoc->nextMsgID++;
1459- T_ASC_PresentationContextID presId;
1460- T_DIMSE_C_FindRQ req;
1461- T_DIMSE_C_FindRSP rsp;
1462- DcmDataset *statusDetail = NULL;
1463-
1464- if(query == NULL) {
1465- return DIMSE_BADDATA;
1466- }
1467-
1468- DeleteResultStack();
1469-
1470- /* which presentation context should be used */
1471- presId = ASC_findAcceptedPresentationContextID(assoc, m_abstractSyntax);
1472- if (presId == 0) {
1473- return DIMSE_NOVALIDPRESENTATIONCONTEXTID;
1474- }
1475-
1476- req.MessageID = msgId;
1477- req.DataSetType = DIMSE_DATASET_PRESENT;
1478- req.Priority = DIMSE_PRIORITY_LOW;
1479- strcpy(req.AffectedSOPClassUID, m_abstractSyntax);
1480-
1481- cond = DIMSE_findUser(assoc, presId, &req, query,
1482- findCallback, (void*)this,
1483- (m_timeout == 0) ? DIMSE_BLOCKING : DIMSE_NONBLOCKING,
1484- m_timeout,
1485- &rsp, &statusDetail);
1486-
1487-
1488- if (cond == DIMSE_NORMAL) {
1489- if (rsp.DimseStatus == STATUS_Success) {
1490- }
1491- }
1492-
1493- if (statusDetail != NULL) {
1494- printf(" Status Detail:\n");
1495- statusDetail->print(COUT);
1496- delete statusDetail;
1497- }
1498- return cond;
1499-}
1500-
1501-void FindAssociation::findCallback(void* callbackData, T_DIMSE_C_FindRQ*, int responseCount, T_DIMSE_C_FindRSP*, DcmDataset *responseIdentifiers) {
1502- FindAssociation* caller = (FindAssociation*)callbackData;
1503-
1504- if(responseCount > caller->maxResults) {
1505- return;
1506- }
1507-
1508- DcmDataset* response = new DcmDataset(*responseIdentifiers);
1509-
1510- if(caller->bPushResults) {
1511- caller->result.push(response);
1512- }
1513- caller->OnResponseReceived(response);
1514-}
1515-
1516-CONDITION FindAssociation::SendObject(DcmDataset *dataset) {
1517- return findSCU(assoc, dataset);
1518-}
1519-
1520-void FindAssociation::OnResponseReceived(DcmDataset *response) {
1521-}
1522-
1523-DcmStack* FindAssociation::GetResultStack() {
1524- return &result;
1525-}
1526-
1527-DcmStack FindAssociation::CopyResultStack() {
1528- DcmStack copy;
1529-
1530- for(unsigned int i=0; i<result.card(); i++) {
1531- DcmDataset* dset = new DcmDataset(*(DcmDataset*)result.elem(i));
1532- copy.push(dset);
1533- }
1534-
1535- return copy;
1536-}
1537-
1538-void FindAssociation::DeleteResultStack() {
1539- DcmDataset* obj = NULL;
1540- unsigned int size = result.card();
1541-
1542- for(Uint32 i=0; i < size; i++){
1543- obj = (DcmDataset*)result.elem(i);
1544- delete obj;
1545- }
1546-
1547- result.clear();
1548-}
1549-
1550-void FindAssociation::SetMaxResults(int max) {
1551- maxResults = max;
1552-}
1553-
1554-int FindAssociation::GetMaxResults() {
1555- return maxResults;
1556-}
1557
1558=== removed file '.pc/dcmdata_debug.patch/imagepool/poolmoveassociation.cpp'
1559--- .pc/dcmdata_debug.patch/imagepool/poolmoveassociation.cpp 2012-01-02 22:24:12 +0000
1560+++ .pc/dcmdata_debug.patch/imagepool/poolmoveassociation.cpp 1970-01-01 00:00:00 +0000
1561@@ -1,342 +0,0 @@
1562-/*
1563- Aeskulap ImagePool - DICOM abstraction library
1564- Copyright (C) 2005 Alexander Pipelka
1565-
1566- This library is free software; you can redistribute it and/or
1567- modify it under the terms of the GNU Library General Public
1568- License as published by the Free Software Foundation; either
1569- version 2 of the License, or (at your option) any later version.
1570-
1571- This library is distributed in the hope that it will be useful,
1572- but WITHOUT ANY WARRANTY; without even the implied warranty of
1573- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1574- Library General Public License for more details.
1575-
1576- You should have received a copy of the GNU Library General Public
1577- License along with this library; if not, write to the Free
1578- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1579-
1580- Alexander Pipelka
1581- pipelka@teleweb.at
1582-
1583- Last Update: $Author$
1584- Update Date: $Date$
1585- Source File: $Source$
1586- CVS/RCS Revision: $Revision$
1587- Status: $State$
1588-*/
1589-
1590-#include "poolnetwork.h"
1591-#include "poolmoveassociation.h"
1592-
1593-
1594-
1595-#include "dcmtk/dcmnet/dimse.h"
1596-#include "dcmtk/dcmnet/diutil.h"
1597-#include "dcmtk/dcmdata/dcfilefo.h"
1598-#include "dcmtk/dcmdata/dcdebug.h"
1599-#include "dcmtk/dcmdata/dcuid.h"
1600-#include "dcmtk/dcmdata/dcdict.h"
1601-#include "dcmtk/dcmdata/cmdlnarg.h"
1602-#include "dcmtk/ofstd/ofconapp.h"
1603-#include "dcmtk/ofstd/ofstd.h"
1604-#include "dcmtk/ofstd/ofdatime.h"
1605-#include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */
1606-#include "dcmtk/dcmnet/dicom.h" /* for DICOM_APPLICATION_ACCEPTOR */
1607-#include "dcmtk/dcmdata/dcdeftag.h" /* for DCM_StudyInstanceUID */
1608-#include "dcmtk/dcmdata/dcostrmz.h" /* for dcmZlibCompressionLevel */
1609-#include "dcmtk/dcmnet/dcasccfg.h" /* for class DcmAssociationConfiguration */
1610-#include "dcmtk/dcmnet/dcasccff.h" /* for class DcmAssociationConfigurationFile */
1611-
1612-#ifdef WITH_OPENSSL
1613-#include "dcmtk/dcmtls/tlstrans.h"
1614-#include "dcmtk/dcmtls/tlslayer.h"
1615-#endif
1616-
1617-#include "dcmtk/dcmjpeg/djencode.h"
1618-#include "dcmtk/dcmjpeg/djrplol.h"
1619-
1620-
1621-MoveAssociation::MoveAssociation() {
1622- m_abstractSyntax = UID_MOVEStudyRootQueryRetrieveInformationModel;
1623- m_maxReceivePDULength = ASC_DEFAULTMAXPDU;
1624-}
1625-
1626-MoveAssociation::~MoveAssociation() {
1627-}
1628-
1629-void MoveAssociation::Create(const std::string& title, const std::string& peer, int port, const std::string& ouraet, /*int ourPort,*/ const char *abstractSyntax/*, const char *abstractSyntaxMove*/) {
1630- Association::Create(title, peer, port, ouraet, abstractSyntax);
1631-}
1632-
1633-CONDITION MoveAssociation::SendObject(DcmDataset *dataset) {
1634- return moveSCU(dataset);
1635-}
1636-
1637-void MoveAssociation::OnAddPresentationContext(T_ASC_Parameters *params, const char* transferSyntaxList[], int transferSyntaxListCount) {
1638- const char* mpeg_transfer[] = { UID_MPEG2MainProfileAtMainLevelTransferSyntax };
1639-
1640- ASC_addPresentationContext(params, 3, m_abstractSyntax, transferSyntaxList, transferSyntaxListCount);
1641- ASC_addPresentationContext(params, 5, m_abstractSyntax, mpeg_transfer, DIM_OF(mpeg_transfer));
1642-}
1643-
1644-CONDITION MoveAssociation::moveSCU(DcmDataset *pdset) {
1645- CONDITION cond;
1646- T_ASC_PresentationContextID presId;
1647- T_DIMSE_C_MoveRQ req;
1648- T_DIMSE_C_MoveRSP rsp;
1649- DIC_US msgId = assoc->nextMsgID++;
1650- DcmDataset* rspIds = NULL;
1651- const char* sopClass;
1652- DcmDataset* statusDetail = NULL;
1653- MoveCallbackInfo callbackData;
1654-
1655- if(pdset == NULL) {
1656- return DIMSE_NULLKEY;
1657- }
1658-
1659- //sopClass = m_abstractSyntaxMove;
1660- sopClass = m_abstractSyntax;
1661-
1662- // which presentation context should be used
1663- presId = ASC_findAcceptedPresentationContextID(assoc, sopClass);
1664-
1665- if (presId == 0) {
1666- return DIMSE_NOVALIDPRESENTATIONCONTEXTID;
1667- }
1668-
1669- callbackData.assoc = assoc;
1670- callbackData.presId = presId;
1671- callbackData.pCaller = this;
1672-
1673- req.MessageID = msgId;
1674- strcpy(req.AffectedSOPClassUID, sopClass);
1675- req.Priority = DIMSE_PRIORITY_HIGH;
1676- req.DataSetType = DIMSE_DATASET_PRESENT;
1677- strcpy(req.MoveDestination, m_ourAET.c_str());
1678-
1679- cond = DIMSE_moveUser(
1680- assoc,
1681- presId,
1682- &req,
1683- pdset,
1684- moveCallback,
1685- &callbackData,
1686- DIMSE_BLOCKING,
1687- 0,
1688- GetNetwork()->GetDcmtkNet(),
1689- subOpCallback,
1690- this,
1691- &rsp, &statusDetail, &rspIds);
1692-
1693- if (statusDetail != NULL) {
1694- printf(" Status Detail:\n");
1695- statusDetail->print(COUT);
1696- delete statusDetail;
1697- }
1698-
1699- if (rspIds != NULL) {
1700- delete rspIds;
1701- }
1702-
1703- return cond;
1704-}
1705-
1706-void MoveAssociation::moveCallback(void *callbackData, T_DIMSE_C_MoveRQ *request, int responseCount, T_DIMSE_C_MoveRSP *response) {
1707-}
1708-
1709-void MoveAssociation::subOpCallback(void *pCaller, T_ASC_Network *aNet, T_ASC_Association **subAssoc) {
1710- MoveAssociation* caller = (MoveAssociation*)pCaller;
1711-
1712- if (caller->GetNetwork() == NULL) {
1713- return;
1714- }
1715-
1716- if (*subAssoc == NULL) {
1717- // negotiate association
1718- caller->acceptSubAssoc(aNet, subAssoc);
1719- }
1720- else{
1721- // be a service class provider
1722- caller->subOpSCP(subAssoc);
1723- }
1724-}
1725-
1726-CONDITION MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) {
1727- CONDITION cond = ASC_NORMAL;
1728- const char* knownAbstractSyntaxes[] = { UID_VerificationSOPClass };
1729- const char* transferSyntaxes[] = { UID_JPEGProcess14SV1TransferSyntax, NULL, NULL, UID_LittleEndianImplicitTransferSyntax, UID_MPEG2MainProfileAtMainLevelTransferSyntax };
1730-
1731- if(m_accept_lossy) {
1732- transferSyntaxes[0] = UID_JPEGProcess2_4TransferSyntax;
1733- }
1734-
1735- cond = ASC_receiveAssociation(aNet, assoc, m_maxReceivePDULength);
1736- if (cond.bad()) {
1737- printf("Unable to receive association!\n");
1738- DimseCondition::dump(cond);
1739- }
1740- else {
1741-
1742- /*
1743- ** We prefer to accept Explicitly encoded transfer syntaxes.
1744- ** If we are running on a Little Endian machine we prefer
1745- ** LittleEndianExplicitTransferSyntax to BigEndianTransferSyntax.
1746- */
1747-
1748- /* gLocalByteOrder is defined in dcxfer.h */
1749- if (gLocalByteOrder == EBO_LittleEndian) {
1750- /* we are on a little endian machine */
1751- transferSyntaxes[1] = UID_LittleEndianExplicitTransferSyntax;
1752- transferSyntaxes[2] = UID_BigEndianExplicitTransferSyntax;
1753- } else {
1754- /* we are on a big endian machine */
1755- transferSyntaxes[1] = UID_BigEndianExplicitTransferSyntax;
1756- transferSyntaxes[2] = UID_LittleEndianExplicitTransferSyntax;
1757- }
1758-
1759- // accept the Verification SOP Class if presented */
1760- cond = ASC_acceptContextsWithPreferredTransferSyntaxes(
1761- (*assoc)->params,
1762- knownAbstractSyntaxes, DIM_OF(knownAbstractSyntaxes),
1763- transferSyntaxes, DIM_OF(transferSyntaxes));
1764-
1765- if (cond.good()) {
1766- // the array of Storage SOP Class UIDs comes from dcuid.h
1767- cond = ASC_acceptContextsWithPreferredTransferSyntaxes(
1768- (*assoc)->params,
1769- dcmAllStorageSOPClassUIDs, numberOfAllDcmStorageSOPClassUIDs,
1770- transferSyntaxes, DIM_OF(transferSyntaxes));
1771- }
1772- }
1773-
1774- if (cond.good()) {
1775- cond = ASC_acknowledgeAssociation(*assoc);
1776- }
1777-
1778- if (cond.bad()) {
1779- ASC_dropAssociation(*assoc);
1780- ASC_destroyAssociation(assoc);
1781- }
1782-
1783- return cond;
1784-
1785-}
1786-
1787-CONDITION MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
1788- T_DIMSE_Message msg;
1789- T_ASC_PresentationContextID presID;
1790-
1791- /* just in case */
1792- if (!ASC_dataWaiting(*subAssoc, 0)) {
1793- return DIMSE_NODATAAVAILABLE;
1794- }
1795-
1796- OFCondition cond = DIMSE_receiveCommand(*subAssoc, DIMSE_BLOCKING, 0, &presID, &msg, NULL);
1797-
1798- if (cond == EC_Normal) {
1799- switch (msg.CommandField) {
1800- case DIMSE_C_STORE_RQ:
1801- cond = storeSCP(*subAssoc, &msg, presID);
1802- break;
1803- case DIMSE_C_ECHO_RQ:
1804- cond = echoSCP(*subAssoc, &msg, presID);
1805- break;
1806- default:
1807- cond = DIMSE_BADCOMMANDTYPE;
1808- break;
1809- }
1810- }
1811-
1812- // clean up on association termination
1813- if (cond == DUL_PEERREQUESTEDRELEASE) {
1814- cond = ASC_acknowledgeRelease(*subAssoc);
1815- ASC_dropSCPAssociation(*subAssoc);
1816- ASC_destroyAssociation(subAssoc);
1817- return cond;
1818- }
1819- else if (cond == DUL_PEERABORTEDASSOCIATION) {
1820- }
1821- else if (cond != EC_Normal) {
1822- DimseCondition::dump(cond);
1823- // some kind of error so abort the association
1824- cond = ASC_abortAssociation(*subAssoc);
1825- }
1826-
1827- if (cond != EC_Normal) {
1828- ASC_dropAssociation(*subAssoc);
1829- ASC_destroyAssociation(subAssoc);
1830- }
1831- return cond;
1832-}
1833-
1834-CONDITION MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
1835- CONDITION cond;
1836- T_DIMSE_C_StoreRQ* req;
1837- DcmDataset *dset = new DcmDataset;
1838-
1839- req = &msg->msg.CStoreRQ;
1840-
1841- StoreCallbackInfo callbackData;
1842- callbackData.dataset = dset;
1843- callbackData.pCaller = this;
1844-
1845- cond = DIMSE_storeProvider(assoc, presID, req, (char *)NULL, 1,
1846- &dset, storeSCPCallback, (void*)&callbackData,
1847- DIMSE_BLOCKING, 0);
1848-
1849- delete dset;
1850- return cond;
1851-}
1852-
1853-void MoveAssociation::storeSCPCallback(void *callbackData, T_DIMSE_StoreProgress *progress, T_DIMSE_C_StoreRQ *req, char *imageFileName, DcmDataset **imageDataSet, T_DIMSE_C_StoreRSP *rsp, DcmDataset **statusDetail) {
1854- DIC_UI sopClass;
1855- DIC_UI sopInstance;
1856-
1857- StoreCallbackInfo *cbdata = (StoreCallbackInfo*) callbackData;
1858- MoveAssociation* caller = cbdata->pCaller;
1859-
1860- if (progress->state == DIMSE_StoreEnd) {
1861- *statusDetail = NULL; /* no status detail */
1862-
1863- /* could save the image somewhere else, put it in database, etc */
1864- rsp->DimseStatus = STATUS_Success;
1865-
1866- if ((imageDataSet)&&(*imageDataSet)) {
1867- // do not duplicate the dataset, let the user do this
1868- // if he wants to
1869- caller->OnResponseReceived(cbdata->dataset);
1870- }
1871-
1872- /* should really check the image to make sure it is consistent,
1873- * that its sopClass and sopInstance correspond with those in
1874- * the request.
1875- */
1876- if (rsp->DimseStatus == STATUS_Success) {
1877- /* which SOP class and SOP instance ? */
1878- if (! DU_findSOPClassAndInstanceInDataSet(cbdata->dataset, sopClass, sopInstance)) {
1879- rsp->DimseStatus = STATUS_STORE_Error_CannotUnderstand;
1880- }
1881- else if (strcmp(sopClass, req->AffectedSOPClassUID) != 0) {
1882- rsp->DimseStatus = STATUS_STORE_Error_DataSetDoesNotMatchSOPClass;
1883- }
1884- else if (strcmp(sopInstance, req->AffectedSOPInstanceUID) != 0) {
1885- rsp->DimseStatus = STATUS_STORE_Error_DataSetDoesNotMatchSOPClass;
1886- }
1887- }
1888-
1889- }
1890-
1891-}
1892-
1893-CONDITION MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
1894- CONDITION cond;
1895-
1896- // the echo succeeded !!
1897- cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL);
1898-
1899- return cond;
1900-}
1901-
1902-void MoveAssociation::OnResponseReceived(DcmDataset* response) {
1903-}
1904
1905=== removed directory '.pc/findAndCopyElement.patch'
1906=== removed directory '.pc/findAndCopyElement.patch/imagepool'
1907=== removed file '.pc/findAndCopyElement.patch/imagepool/dicomdir.cpp'
1908--- .pc/findAndCopyElement.patch/imagepool/dicomdir.cpp 2012-01-02 22:24:12 +0000
1909+++ .pc/findAndCopyElement.patch/imagepool/dicomdir.cpp 1970-01-01 00:00:00 +0000
1910@@ -1,255 +0,0 @@
1911-#include "imagepool.h"
1912-#include "gtkmm.h"
1913-#include "dcmtk/dcmdata/dcdatset.h"
1914-#include "dcmtk/dcmdata/dcdeftag.h"
1915-#include "dcmtk/dcmdata/dcdicdir.h"
1916-#include "dcmtk/dcmdata/dcdirrec.h"
1917-#include "gettext.h"
1918-
1919-#include <iostream>
1920-
1921-namespace ImagePool {
1922-
1923- // Some forward declaration
1924-
1925- Glib::RefPtr< ImagePool::Study > create_query_study(DcmDataset* dset, const std::string& server);
1926-
1927- Glib::RefPtr< ImagePool::Series > create_query_series(DcmDataset* dset);
1928-
1929- static bool open_dicomdir_patient(
1930- const Glib::ustring &dicomdir,
1931- DcmDirectoryRecord *patRec,
1932- const sigc::slot< void, const Glib::RefPtr< ImagePool::Study >& >& resultslot
1933- );
1934-
1935- static bool open_dicomdir_study(
1936- const Glib::ustring &dicomdir,
1937- DcmDirectoryRecord *patRec,
1938- DcmDirectoryRecord *studyRec,
1939- const sigc::slot< void, const Glib::RefPtr< ImagePool::Study >& >& resultslot
1940- );
1941-
1942- static void open_dicomdir_series_result(
1943- const Glib::ustring &dicomdir,
1944- DcmDirectoryRecord *patRec,
1945- DcmDirectoryRecord *studyRec,
1946- const sigc::slot< void, const Glib::RefPtr< ImagePool::Series >& >& resultslot
1947- );
1948-
1949- /**
1950- * Reads a dicomdir and signals every found study
1951- */
1952- void open_dicomdir( const Glib::ustring &dicomdir, const sigc::slot< void, const Glib::RefPtr< ImagePool::Study >& >& resultslot) {
1953- DcmDicomDir dir(dicomdir.c_str());
1954- OFCondition ret;
1955-
1956- if ( (ret=dir.error()) != ECC_Normal ) {
1957- std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
1958- return;
1959- }
1960-
1961- DcmDirectoryRecord root = dir.getRootRecord();
1962- DcmDirectoryRecord *rec = root.nextSub(NULL);
1963- std::cout << "Reading DICOMDIR from [" << dicomdir << "]\n";
1964- while ( rec != NULL ) {
1965- switch ( rec->getRecordType() ) {
1966- case ERT_Patient:
1967- open_dicomdir_patient(dicomdir, rec, resultslot);
1968- break;
1969- case ERT_HangingProtocol:
1970- // FALLTHROUGH
1971- case ERT_Private:
1972- break;
1973- default:
1974- std::cout << "WARNING: Bad DICOMDIR Record type[" << rec->getRecordType() << "] found\n";
1975- }
1976- rec = root.nextSub(rec);
1977- }
1978- /*
1979- // Leggo il root record, � un paziente ?
1980- {
1981- case ERT_root = 0,
1982- case ERT_Curve = 1,
1983- case ERT_FilmBox = 2,
1984- case ERT_FilmSession = 3,
1985- case ERT_Image = 4,
1986- case ERT_ImageBox = 5,
1987- case ERT_Interpretation = 6,
1988- ERT_ModalityLut = 7,
1989- ERT_Mrdr = 8,
1990- ERT_Overlay = 9,
1991- ERT_Patient = 10,
1992- ERT_PrintQueue = 11,
1993- ERT_Private = 12,
1994- ERT_Results = 13,
1995- ERT_Series = 14,
1996- ERT_Study = 15,
1997- ERT_StudyComponent = 16,
1998- ERT_Topic = 17,
1999- ERT_Visit = 18,
2000- ERT_VoiLut = 19,
2001- ERT_StructReport = 20,
2002- ERT_Presentation = 21,
2003- ERT_Waveform = 22,
2004- ERT_RTDose = 23,
2005- ERT_RTStructureSet = 24,
2006- ERT_RTPlan = 25,
2007- ERT_RTTreatRecord = 26,
2008- ERT_StoredPrint = 27,
2009- ERT_KeyObjectDoc = 28,
2010- ERT_Registration = 29,
2011- ERT_Fiducial = 30,
2012- ERT_RawData = 31,
2013- ERT_Spectroscopy = 32,
2014- ERT_EncapDoc = 33,
2015- ERT_ValueMap = 34,
2016- ERT_HangingProtocol = 35
2017- */
2018- }
2019-
2020- static bool open_dicomdir_patient(const Glib::ustring& dicomdir, DcmDirectoryRecord *patRec, const sigc::slot< void, const Glib::RefPtr< ImagePool::Study >& >& resultslot) {
2021- bool studyFound(false);
2022- DcmDirectoryRecord *subRec;
2023-
2024- assert(patRec->getRecordType()==ERT_Patient);
2025- subRec = patRec->nextSub(NULL);
2026- while ( subRec ) {
2027- switch ( subRec->getRecordType() ) {
2028- case ERT_Study:
2029- studyFound = open_dicomdir_study(dicomdir, patRec, subRec, resultslot);
2030- break;
2031- case ERT_Private:
2032- break;
2033- default:
2034- std::cout << "WARNING: Bad DICOMDIR SubRecord type[" << subRec->getRecordType() << "] for Patient found\n";
2035- }
2036- subRec = patRec->nextSub(subRec);
2037- }
2038- return studyFound;
2039- }
2040-
2041- static bool open_dicomdir_study(const Glib::ustring& dicomdir, DcmDirectoryRecord *patRec, DcmDirectoryRecord *studyRec, const sigc::slot< void, const Glib::RefPtr< ImagePool::Study >& >& resultslot) {
2042- bool seriesFound(false);
2043- DcmDirectoryRecord *subRec;
2044-
2045- assert(studyRec->getRecordType()==ERT_Study);
2046- subRec = studyRec->nextSub(NULL);
2047- while ( subRec && !seriesFound ) {
2048- switch ( subRec->getRecordType() ) {
2049- case ERT_Series:
2050- // Check if valid series (contains at least 1 image)
2051- seriesFound = true;
2052- break;
2053- case ERT_Private:
2054- break;
2055- default:
2056- std::cout << "WARNING: Bad DICOMDIR SubRecord type[" << subRec->getRecordType() << "] for Study found\n";
2057- }
2058- subRec = studyRec->nextSub(subRec);
2059- }
2060- if ( seriesFound ) {
2061- DcmDataset study;
2062- DcmElement *el;
2063-
2064- if ( studyRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
2065- study.insert(el);
2066- if ( studyRec->findAndCopyElement(DCM_StudyInstanceUID, el) == ECC_Normal )
2067- study.insert(el);
2068- if ( studyRec->findAndCopyElement(DCM_StudyDate, el) == ECC_Normal )
2069- study.insert(el);
2070- if ( studyRec->findAndCopyElement(DCM_StudyTime, el) == ECC_Normal )
2071- study.insert(el);
2072- if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
2073- study.insert(el);
2074- if ( patRec->findAndCopyElement(DCM_PatientsName, el) == ECC_Normal )
2075- study.insert(el);
2076- if ( patRec->findAndCopyElement(DCM_PatientsBirthDate, el) == ECC_Normal )
2077- study.insert(el);
2078- if ( patRec->findAndCopyElement(DCM_PatientsSex, el) == ECC_Normal )
2079- study.insert(el);
2080- resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
2081- }
2082- return seriesFound;
2083- }
2084-
2085- void open_dicomdir_series(const std::string& studyinstanceuid, const Glib::ustring& dicomdir, const sigc::slot< void, const Glib::RefPtr< ImagePool::Series >& >& resultslot) {
2086- DcmDicomDir dir(dicomdir.c_str());
2087- DcmDirectoryRecord *patRec;
2088- DcmDirectoryRecord *studyRec;
2089- DcmDirectoryRecord *seriesRec;
2090- OFCondition ret;
2091-
2092- if ( dir.error() != ECC_Normal ) {
2093- std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
2094- return;
2095- }
2096-
2097- DcmDirectoryRecord &root = dir.getRootRecord();
2098- for ( patRec = root.nextSub(NULL); patRec!=NULL; patRec = root.nextSub(patRec) ) {
2099- switch ( patRec->getRecordType() ) {
2100- case ERT_Patient:
2101- for ( studyRec=patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
2102- if ( studyRec->getRecordType()==ERT_Study ) {
2103- OFString uid;
2104- if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
2105- if ( studyinstanceuid == uid.c_str() ) {
2106- open_dicomdir_series_result(dicomdir, patRec, studyRec, resultslot);
2107- return;
2108- }
2109- }
2110- }
2111- }
2112- break;
2113- case ERT_HangingProtocol:
2114- // FALLTHROUGH
2115- case ERT_Private:
2116- break;
2117- default:
2118- break;
2119- }
2120- }
2121- std::cout << "WARNING: study[" << studyinstanceuid << "] not found in DICOMDIR\n";
2122- }
2123-
2124- static void open_dicomdir_series_result(const Glib::ustring &dicomdir, DcmDirectoryRecord *patRec, DcmDirectoryRecord *studyRec, const sigc::slot< void, const Glib::RefPtr< ImagePool::Series >& >& resultslot) {
2125- DcmDirectoryRecord *seriesRec;
2126- DcmDirectoryRecord *sopRec;
2127- assert(studyRec->getRecordType()==ERT_Study);
2128-
2129- seriesRec = studyRec->nextSub(NULL);
2130- while ( seriesRec ) {
2131- DcmDataset series;
2132- DcmElement *el;
2133-
2134- if ( seriesRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
2135- series.insert(el);
2136- if ( seriesRec->findAndCopyElement(DCM_SeriesDescription, el) == ECC_Normal )
2137- series.insert(el);
2138- if ( seriesRec->findAndCopyElement(DCM_SeriesInstanceUID, el) == ECC_Normal )
2139- series.insert(el);
2140- if ( seriesRec->findAndCopyElement(DCM_Modality, el) == ECC_Normal )
2141- series.insert(el);
2142- if ( seriesRec->findAndCopyElement(DCM_SeriesDate, el) == ECC_Normal )
2143- series.insert(el);
2144- if ( seriesRec->findAndCopyElement(DCM_SeriesTime, el) == ECC_Normal )
2145- series.insert(el);
2146- if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
2147- series.insert(el);
2148- if ( studyRec->findAndCopyElement(DCM_StationName, el) == ECC_Normal )
2149- series.insert(el);
2150-
2151- // Count Related SOP Instances
2152- int nSop=0;
2153- sopRec = seriesRec->nextSub(NULL);
2154- while (sopRec) {
2155- nSop++;
2156- sopRec = seriesRec->nextSub(sopRec);
2157- }
2158- series.putAndInsertUint16(DCM_NumberOfSeriesRelatedInstances, nSop);
2159- resultslot(create_query_series(&series));
2160- seriesRec = studyRec->nextSub(seriesRec);
2161- }
2162- }
2163-
2164-} // namespace ImagePool
2165-
2166
2167=== removed directory '.pc/oflog.patch'
2168=== removed file '.pc/oflog.patch/configure'
2169--- .pc/oflog.patch/configure 2012-01-02 22:24:12 +0000
2170+++ .pc/oflog.patch/configure 1970-01-01 00:00:00 +0000
2171@@ -1,25949 +0,0 @@
2172-#! /bin/sh
2173-# Guess values for system-dependent variables and create Makefiles.
2174-# Generated by GNU Autoconf 2.61.
2175-#
2176-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2177-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
2178-# This configure script is free software; the Free Software Foundation
2179-# gives unlimited permission to copy, distribute and modify it.
2180-## --------------------- ##
2181-## M4sh Initialization. ##
2182-## --------------------- ##
2183-
2184-# Be more Bourne compatible
2185-DUALCASE=1; export DUALCASE # for MKS sh
2186-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2187- emulate sh
2188- NULLCMD=:
2189- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
2190- # is contrary to our usage. Disable this feature.
2191- alias -g '${1+"$@"}'='"$@"'
2192- setopt NO_GLOB_SUBST
2193-else
2194- case `(set -o) 2>/dev/null` in
2195- *posix*) set -o posix ;;
2196-esac
2197-
2198-fi
2199-
2200-
2201-
2202-
2203-# PATH needs CR
2204-# Avoid depending upon Character Ranges.
2205-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
2206-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
2207-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
2208-as_cr_digits='0123456789'
2209-as_cr_alnum=$as_cr_Letters$as_cr_digits
2210-
2211-# The user is always right.
2212-if test "${PATH_SEPARATOR+set}" != set; then
2213- echo "#! /bin/sh" >conf$$.sh
2214- echo "exit 0" >>conf$$.sh
2215- chmod +x conf$$.sh
2216- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2217- PATH_SEPARATOR=';'
2218- else
2219- PATH_SEPARATOR=:
2220- fi
2221- rm -f conf$$.sh
2222-fi
2223-
2224-# Support unset when possible.
2225-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
2226- as_unset=unset
2227-else
2228- as_unset=false
2229-fi
2230-
2231-
2232-# IFS
2233-# We need space, tab and new line, in precisely that order. Quoting is
2234-# there to prevent editors from complaining about space-tab.
2235-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
2236-# splitting by setting IFS to empty value.)
2237-as_nl='
2238-'
2239-IFS=" "" $as_nl"
2240-
2241-# Find who we are. Look in the path if we contain no directory separator.
2242-case $0 in
2243- *[\\/]* ) as_myself=$0 ;;
2244- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2245-for as_dir in $PATH
2246-do
2247- IFS=$as_save_IFS
2248- test -z "$as_dir" && as_dir=.
2249- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
2250-done
2251-IFS=$as_save_IFS
2252-
2253- ;;
2254-esac
2255-# We did not find ourselves, most probably we were run as `sh COMMAND'
2256-# in which case we are not to be found in the path.
2257-if test "x$as_myself" = x; then
2258- as_myself=$0
2259-fi
2260-if test ! -f "$as_myself"; then
2261- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
2262- { (exit 1); exit 1; }
2263-fi
2264-
2265-# Work around bugs in pre-3.0 UWIN ksh.
2266-for as_var in ENV MAIL MAILPATH
2267-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
2268-done
2269-PS1='$ '
2270-PS2='> '
2271-PS4='+ '
2272-
2273-# NLS nuisances.
2274-for as_var in \
2275- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
2276- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
2277- LC_TELEPHONE LC_TIME
2278-do
2279- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
2280- eval $as_var=C; export $as_var
2281- else
2282- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
2283- fi
2284-done
2285-
2286-# Required to use basename.
2287-if expr a : '\(a\)' >/dev/null 2>&1 &&
2288- test "X`expr 00001 : '.*\(...\)'`" = X001; then
2289- as_expr=expr
2290-else
2291- as_expr=false
2292-fi
2293-
2294-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
2295- as_basename=basename
2296-else
2297- as_basename=false
2298-fi
2299-
2300-
2301-# Name of the executable.
2302-as_me=`$as_basename -- "$0" ||
2303-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
2304- X"$0" : 'X\(//\)$' \| \
2305- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
2306-echo X/"$0" |
2307- sed '/^.*\/\([^/][^/]*\)\/*$/{
2308- s//\1/
2309- q
2310- }
2311- /^X\/\(\/\/\)$/{
2312- s//\1/
2313- q
2314- }
2315- /^X\/\(\/\).*/{
2316- s//\1/
2317- q
2318- }
2319- s/.*/./; q'`
2320-
2321-# CDPATH.
2322-$as_unset CDPATH
2323-
2324-
2325-if test "x$CONFIG_SHELL" = x; then
2326- if (eval ":") 2>/dev/null; then
2327- as_have_required=yes
2328-else
2329- as_have_required=no
2330-fi
2331-
2332- if test $as_have_required = yes && (eval ":
2333-(as_func_return () {
2334- (exit \$1)
2335-}
2336-as_func_success () {
2337- as_func_return 0
2338-}
2339-as_func_failure () {
2340- as_func_return 1
2341-}
2342-as_func_ret_success () {
2343- return 0
2344-}
2345-as_func_ret_failure () {
2346- return 1
2347-}
2348-
2349-exitcode=0
2350-if as_func_success; then
2351- :
2352-else
2353- exitcode=1
2354- echo as_func_success failed.
2355-fi
2356-
2357-if as_func_failure; then
2358- exitcode=1
2359- echo as_func_failure succeeded.
2360-fi
2361-
2362-if as_func_ret_success; then
2363- :
2364-else
2365- exitcode=1
2366- echo as_func_ret_success failed.
2367-fi
2368-
2369-if as_func_ret_failure; then
2370- exitcode=1
2371- echo as_func_ret_failure succeeded.
2372-fi
2373-
2374-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
2375- :
2376-else
2377- exitcode=1
2378- echo positional parameters were not saved.
2379-fi
2380-
2381-test \$exitcode = 0) || { (exit 1); exit 1; }
2382-
2383-(
2384- as_lineno_1=\$LINENO
2385- as_lineno_2=\$LINENO
2386- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
2387- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
2388-") 2> /dev/null; then
2389- :
2390-else
2391- as_candidate_shells=
2392- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2393-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
2394-do
2395- IFS=$as_save_IFS
2396- test -z "$as_dir" && as_dir=.
2397- case $as_dir in
2398- /*)
2399- for as_base in sh bash ksh sh5; do
2400- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
2401- done;;
2402- esac
2403-done
2404-IFS=$as_save_IFS
2405-
2406-
2407- for as_shell in $as_candidate_shells $SHELL; do
2408- # Try only shells that exist, to save several forks.
2409- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
2410- { ("$as_shell") 2> /dev/null <<\_ASEOF
2411-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2412- emulate sh
2413- NULLCMD=:
2414- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
2415- # is contrary to our usage. Disable this feature.
2416- alias -g '${1+"$@"}'='"$@"'
2417- setopt NO_GLOB_SUBST
2418-else
2419- case `(set -o) 2>/dev/null` in
2420- *posix*) set -o posix ;;
2421-esac
2422-
2423-fi
2424-
2425-
2426-:
2427-_ASEOF
2428-}; then
2429- CONFIG_SHELL=$as_shell
2430- as_have_required=yes
2431- if { "$as_shell" 2> /dev/null <<\_ASEOF
2432-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2433- emulate sh
2434- NULLCMD=:
2435- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
2436- # is contrary to our usage. Disable this feature.
2437- alias -g '${1+"$@"}'='"$@"'
2438- setopt NO_GLOB_SUBST
2439-else
2440- case `(set -o) 2>/dev/null` in
2441- *posix*) set -o posix ;;
2442-esac
2443-
2444-fi
2445-
2446-
2447-:
2448-(as_func_return () {
2449- (exit $1)
2450-}
2451-as_func_success () {
2452- as_func_return 0
2453-}
2454-as_func_failure () {
2455- as_func_return 1
2456-}
2457-as_func_ret_success () {
2458- return 0
2459-}
2460-as_func_ret_failure () {
2461- return 1
2462-}
2463-
2464-exitcode=0
2465-if as_func_success; then
2466- :
2467-else
2468- exitcode=1
2469- echo as_func_success failed.
2470-fi
2471-
2472-if as_func_failure; then
2473- exitcode=1
2474- echo as_func_failure succeeded.
2475-fi
2476-
2477-if as_func_ret_success; then
2478- :
2479-else
2480- exitcode=1
2481- echo as_func_ret_success failed.
2482-fi
2483-
2484-if as_func_ret_failure; then
2485- exitcode=1
2486- echo as_func_ret_failure succeeded.
2487-fi
2488-
2489-if ( set x; as_func_ret_success y && test x = "$1" ); then
2490- :
2491-else
2492- exitcode=1
2493- echo positional parameters were not saved.
2494-fi
2495-
2496-test $exitcode = 0) || { (exit 1); exit 1; }
2497-
2498-(
2499- as_lineno_1=$LINENO
2500- as_lineno_2=$LINENO
2501- test "x$as_lineno_1" != "x$as_lineno_2" &&
2502- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
2503-
2504-_ASEOF
2505-}; then
2506- break
2507-fi
2508-
2509-fi
2510-
2511- done
2512-
2513- if test "x$CONFIG_SHELL" != x; then
2514- for as_var in BASH_ENV ENV
2515- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
2516- done
2517- export CONFIG_SHELL
2518- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
2519-fi
2520-
2521-
2522- if test $as_have_required = no; then
2523- echo This script requires a shell more modern than all the
2524- echo shells that I found on your system. Please install a
2525- echo modern shell, or manually run the script under such a
2526- echo shell if you do have one.
2527- { (exit 1); exit 1; }
2528-fi
2529-
2530-
2531-fi
2532-
2533-fi
2534-
2535-
2536-
2537-(eval "as_func_return () {
2538- (exit \$1)
2539-}
2540-as_func_success () {
2541- as_func_return 0
2542-}
2543-as_func_failure () {
2544- as_func_return 1
2545-}
2546-as_func_ret_success () {
2547- return 0
2548-}
2549-as_func_ret_failure () {
2550- return 1
2551-}
2552-
2553-exitcode=0
2554-if as_func_success; then
2555- :
2556-else
2557- exitcode=1
2558- echo as_func_success failed.
2559-fi
2560-
2561-if as_func_failure; then
2562- exitcode=1
2563- echo as_func_failure succeeded.
2564-fi
2565-
2566-if as_func_ret_success; then
2567- :
2568-else
2569- exitcode=1
2570- echo as_func_ret_success failed.
2571-fi
2572-
2573-if as_func_ret_failure; then
2574- exitcode=1
2575- echo as_func_ret_failure succeeded.
2576-fi
2577-
2578-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
2579- :
2580-else
2581- exitcode=1
2582- echo positional parameters were not saved.
2583-fi
2584-
2585-test \$exitcode = 0") || {
2586- echo No shell found that supports shell functions.
2587- echo Please tell autoconf@gnu.org about your system,
2588- echo including any error possibly output before this
2589- echo message
2590-}
2591-
2592-
2593-
2594- as_lineno_1=$LINENO
2595- as_lineno_2=$LINENO
2596- test "x$as_lineno_1" != "x$as_lineno_2" &&
2597- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
2598-
2599- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
2600- # uniformly replaced by the line number. The first 'sed' inserts a
2601- # line-number line after each line using $LINENO; the second 'sed'
2602- # does the real work. The second script uses 'N' to pair each
2603- # line-number line with the line containing $LINENO, and appends
2604- # trailing '-' during substitution so that $LINENO is not a special
2605- # case at line end.
2606- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
2607- # scripts with optimization help from Paolo Bonzini. Blame Lee
2608- # E. McMahon (1931-1989) for sed's syntax. :-)
2609- sed -n '
2610- p
2611- /[$]LINENO/=
2612- ' <$as_myself |
2613- sed '
2614- s/[$]LINENO.*/&-/
2615- t lineno
2616- b
2617- :lineno
2618- N
2619- :loop
2620- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
2621- t loop
2622- s/-\n.*//
2623- ' >$as_me.lineno &&
2624- chmod +x "$as_me.lineno" ||
2625- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
2626- { (exit 1); exit 1; }; }
2627-
2628- # Don't try to exec as it changes $[0], causing all sort of problems
2629- # (the dirname of $[0] is not the place where we might find the
2630- # original and so on. Autoconf is especially sensitive to this).
2631- . "./$as_me.lineno"
2632- # Exit status is that of the last command.
2633- exit
2634-}
2635-
2636-
2637-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
2638- as_dirname=dirname
2639-else
2640- as_dirname=false
2641-fi
2642-
2643-ECHO_C= ECHO_N= ECHO_T=
2644-case `echo -n x` in
2645--n*)
2646- case `echo 'x\c'` in
2647- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
2648- *) ECHO_C='\c';;
2649- esac;;
2650-*)
2651- ECHO_N='-n';;
2652-esac
2653-
2654-if expr a : '\(a\)' >/dev/null 2>&1 &&
2655- test "X`expr 00001 : '.*\(...\)'`" = X001; then
2656- as_expr=expr
2657-else
2658- as_expr=false
2659-fi
2660-
2661-rm -f conf$$ conf$$.exe conf$$.file
2662-if test -d conf$$.dir; then
2663- rm -f conf$$.dir/conf$$.file
2664-else
2665- rm -f conf$$.dir
2666- mkdir conf$$.dir
2667-fi
2668-echo >conf$$.file
2669-if ln -s conf$$.file conf$$ 2>/dev/null; then
2670- as_ln_s='ln -s'
2671- # ... but there are two gotchas:
2672- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2673- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2674- # In both cases, we have to default to `cp -p'.
2675- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2676- as_ln_s='cp -p'
2677-elif ln conf$$.file conf$$ 2>/dev/null; then
2678- as_ln_s=ln
2679-else
2680- as_ln_s='cp -p'
2681-fi
2682-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
2683-rmdir conf$$.dir 2>/dev/null
2684-
2685-if mkdir -p . 2>/dev/null; then
2686- as_mkdir_p=:
2687-else
2688- test -d ./-p && rmdir ./-p
2689- as_mkdir_p=false
2690-fi
2691-
2692-if test -x / >/dev/null 2>&1; then
2693- as_test_x='test -x'
2694-else
2695- if ls -dL / >/dev/null 2>&1; then
2696- as_ls_L_option=L
2697- else
2698- as_ls_L_option=
2699- fi
2700- as_test_x='
2701- eval sh -c '\''
2702- if test -d "$1"; then
2703- test -d "$1/.";
2704- else
2705- case $1 in
2706- -*)set "./$1";;
2707- esac;
2708- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
2709- ???[sx]*):;;*)false;;esac;fi
2710- '\'' sh
2711- '
2712-fi
2713-as_executable_p=$as_test_x
2714-
2715-# Sed expression to map a string onto a valid CPP name.
2716-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
2717-
2718-# Sed expression to map a string onto a valid variable name.
2719-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
2720-
2721-
2722-
2723-
2724-# Check that we are running under the correct shell.
2725-SHELL=${CONFIG_SHELL-/bin/sh}
2726-
2727-case X$ECHO in
2728-X*--fallback-echo)
2729- # Remove one level of quotation (which was required for Make).
2730- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
2731- ;;
2732-esac
2733-
2734-echo=${ECHO-echo}
2735-if test "X$1" = X--no-reexec; then
2736- # Discard the --no-reexec flag, and continue.
2737- shift
2738-elif test "X$1" = X--fallback-echo; then
2739- # Avoid inline document here, it may be left over
2740- :
2741-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
2742- # Yippee, $echo works!
2743- :
2744-else
2745- # Restart under the correct shell.
2746- exec $SHELL "$0" --no-reexec ${1+"$@"}
2747-fi
2748-
2749-if test "X$1" = X--fallback-echo; then
2750- # used as fallback echo
2751- shift
2752- cat <<EOF
2753-$*
2754-EOF
2755- exit 0
2756-fi
2757-
2758-# The HP-UX ksh and POSIX shell print the target directory to stdout
2759-# if CDPATH is set.
2760-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2761-
2762-if test -z "$ECHO"; then
2763-if test "X${echo_test_string+set}" != Xset; then
2764-# find a string as large as possible, as long as the shell can cope with it
2765- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
2766- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
2767- if (echo_test_string=`eval $cmd`) 2>/dev/null &&
2768- echo_test_string=`eval $cmd` &&
2769- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
2770- then
2771- break
2772- fi
2773- done
2774-fi
2775-
2776-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
2777- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
2778- test "X$echo_testing_string" = "X$echo_test_string"; then
2779- :
2780-else
2781- # The Solaris, AIX, and Digital Unix default echo programs unquote
2782- # backslashes. This makes it impossible to quote backslashes using
2783- # echo "$something" | sed 's/\\/\\\\/g'
2784- #
2785- # So, first we look for a working echo in the user's PATH.
2786-
2787- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
2788- for dir in $PATH /usr/ucb; do
2789- IFS="$lt_save_ifs"
2790- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
2791- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
2792- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
2793- test "X$echo_testing_string" = "X$echo_test_string"; then
2794- echo="$dir/echo"
2795- break
2796- fi
2797- done
2798- IFS="$lt_save_ifs"
2799-
2800- if test "X$echo" = Xecho; then
2801- # We didn't find a better echo, so look for alternatives.
2802- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
2803- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
2804- test "X$echo_testing_string" = "X$echo_test_string"; then
2805- # This shell has a builtin print -r that does the trick.
2806- echo='print -r'
2807- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
2808- test "X$CONFIG_SHELL" != X/bin/ksh; then
2809- # If we have ksh, try running configure again with it.
2810- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
2811- export ORIGINAL_CONFIG_SHELL
2812- CONFIG_SHELL=/bin/ksh
2813- export CONFIG_SHELL
2814- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
2815- else
2816- # Try using printf.
2817- echo='printf %s\n'
2818- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
2819- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
2820- test "X$echo_testing_string" = "X$echo_test_string"; then
2821- # Cool, printf works
2822- :
2823- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
2824- test "X$echo_testing_string" = 'X\t' &&
2825- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2826- test "X$echo_testing_string" = "X$echo_test_string"; then
2827- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
2828- export CONFIG_SHELL
2829- SHELL="$CONFIG_SHELL"
2830- export SHELL
2831- echo="$CONFIG_SHELL $0 --fallback-echo"
2832- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
2833- test "X$echo_testing_string" = 'X\t' &&
2834- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2835- test "X$echo_testing_string" = "X$echo_test_string"; then
2836- echo="$CONFIG_SHELL $0 --fallback-echo"
2837- else
2838- # maybe with a smaller string...
2839- prev=:
2840-
2841- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
2842- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
2843- then
2844- break
2845- fi
2846- prev="$cmd"
2847- done
2848-
2849- if test "$prev" != 'sed 50q "$0"'; then
2850- echo_test_string=`eval $prev`
2851- export echo_test_string
2852- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
2853- else
2854- # Oops. We lost completely, so just stick with echo.
2855- echo=echo
2856- fi
2857- fi
2858- fi
2859- fi
2860-fi
2861-fi
2862-
2863-# Copy echo and quote the copy suitably for passing to libtool from
2864-# the Makefile, instead of quoting the original, which is used later.
2865-ECHO=$echo
2866-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
2867- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
2868-fi
2869-
2870-
2871-
2872-
2873-tagnames=${tagnames+${tagnames},}CXX
2874-
2875-tagnames=${tagnames+${tagnames},}F77
2876-
2877-exec 7<&0 </dev/null 6>&1
2878-
2879-# Name of the host.
2880-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
2881-# so uname gets run too.
2882-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
2883-
2884-#
2885-# Initializations.
2886-#
2887-ac_default_prefix=/usr/local
2888-ac_clean_files=
2889-ac_config_libobj_dir=.
2890-LIBOBJS=
2891-cross_compiling=no
2892-subdirs=
2893-MFLAGS=
2894-MAKEFLAGS=
2895-SHELL=${CONFIG_SHELL-/bin/sh}
2896-
2897-# Identity of this package.
2898-PACKAGE_NAME=
2899-PACKAGE_TARNAME=
2900-PACKAGE_VERSION=
2901-PACKAGE_STRING=
2902-PACKAGE_BUGREPORT=
2903-
2904-ac_unique_file="README"
2905-# Factoring default headers for most tests.
2906-ac_includes_default="\
2907-#include <stdio.h>
2908-#ifdef HAVE_SYS_TYPES_H
2909-# include <sys/types.h>
2910-#endif
2911-#ifdef HAVE_SYS_STAT_H
2912-# include <sys/stat.h>
2913-#endif
2914-#ifdef STDC_HEADERS
2915-# include <stdlib.h>
2916-# include <stddef.h>
2917-#else
2918-# ifdef HAVE_STDLIB_H
2919-# include <stdlib.h>
2920-# endif
2921-#endif
2922-#ifdef HAVE_STRING_H
2923-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
2924-# include <memory.h>
2925-# endif
2926-# include <string.h>
2927-#endif
2928-#ifdef HAVE_STRINGS_H
2929-# include <strings.h>
2930-#endif
2931-#ifdef HAVE_INTTYPES_H
2932-# include <inttypes.h>
2933-#endif
2934-#ifdef HAVE_STDINT_H
2935-# include <stdint.h>
2936-#endif
2937-#ifdef HAVE_UNISTD_H
2938-# include <unistd.h>
2939-#endif"
2940-
2941-ac_subst_vars='SHELL
2942-PATH_SEPARATOR
2943-PACKAGE_NAME
2944-PACKAGE_TARNAME
2945-PACKAGE_VERSION
2946-PACKAGE_STRING
2947-PACKAGE_BUGREPORT
2948-exec_prefix
2949-prefix
2950-program_transform_name
2951-bindir
2952-sbindir
2953-libexecdir
2954-datarootdir
2955-datadir
2956-sysconfdir
2957-sharedstatedir
2958-localstatedir
2959-includedir
2960-oldincludedir
2961-docdir
2962-infodir
2963-htmldir
2964-dvidir
2965-pdfdir
2966-psdir
2967-libdir
2968-localedir
2969-mandir
2970-DEFS
2971-ECHO_C
2972-ECHO_N
2973-ECHO_T
2974-LIBS
2975-build_alias
2976-host_alias
2977-target_alias
2978-AESKULAP_VERSION
2979-INSTALL_PROGRAM
2980-INSTALL_SCRIPT
2981-INSTALL_DATA
2982-am__isrc
2983-CYGPATH_W
2984-PACKAGE
2985-VERSION
2986-ACLOCAL
2987-AUTOCONF
2988-AUTOMAKE
2989-AUTOHEADER
2990-MAKEINFO
2991-install_sh
2992-STRIP
2993-INSTALL_STRIP_PROGRAM
2994-mkdir_p
2995-AWK
2996-SET_MAKE
2997-am__leading_dot
2998-AMTAR
2999-am__tar
3000-am__untar
3001-ACLOCAL_AMFLAGS
3002-INTLTOOL_DESKTOP_RULE
3003-INTLTOOL_DIRECTORY_RULE
3004-INTLTOOL_KEYS_RULE
3005-INTLTOOL_PROP_RULE
3006-INTLTOOL_OAF_RULE
3007-INTLTOOL_PONG_RULE
3008-INTLTOOL_SERVER_RULE
3009-INTLTOOL_SHEET_RULE
3010-INTLTOOL_SOUNDLIST_RULE
3011-INTLTOOL_UI_RULE
3012-INTLTOOL_XAM_RULE
3013-INTLTOOL_KBD_RULE
3014-INTLTOOL_XML_RULE
3015-INTLTOOL_XML_NOMERGE_RULE
3016-INTLTOOL_CAVES_RULE
3017-INTLTOOL_SCHEMAS_RULE
3018-INTLTOOL_THEME_RULE
3019-INTLTOOL_SERVICE_RULE
3020-INTLTOOL_POLICY_RULE
3021-XGETTEXT
3022-MSGMERGE
3023-MSGFMT
3024-INTLTOOL_EXTRACT
3025-INTLTOOL_MERGE
3026-INTLTOOL_UPDATE
3027-INTLTOOL_PERL
3028-ALL_LINGUAS
3029-CC
3030-CFLAGS
3031-LDFLAGS
3032-CPPFLAGS
3033-ac_ct_CC
3034-EXEEXT
3035-OBJEXT
3036-DEPDIR
3037-am__include
3038-am__quote
3039-AMDEP_TRUE
3040-AMDEP_FALSE
3041-AMDEPBACKSLASH
3042-CCDEPMODE
3043-am__fastdepCC_TRUE
3044-am__fastdepCC_FALSE
3045-DATADIRNAME
3046-build
3047-build_cpu
3048-build_vendor
3049-build_os
3050-host
3051-host_cpu
3052-host_vendor
3053-host_os
3054-SED
3055-GREP
3056-EGREP
3057-LN_S
3058-ECHO
3059-AR
3060-RANLIB
3061-CPP
3062-CXX
3063-CXXFLAGS
3064-ac_ct_CXX
3065-CXXDEPMODE
3066-am__fastdepCXX_TRUE
3067-am__fastdepCXX_FALSE
3068-CXXCPP
3069-F77
3070-FFLAGS
3071-ac_ct_F77
3072-LIBTOOL
3073-BINRELOC_CFLAGS
3074-BINRELOC_LIBS
3075-GMSGFMT
3076-GCONF_SCHEMA_CONFIG_SOURCE
3077-GCONF_SCHEMA_FILE_DIR
3078-GCONF_SCHEMAS_INSTALL_TRUE
3079-GCONF_SCHEMAS_INSTALL_FALSE
3080-GETTEXT_PACKAGE
3081-CONFIG_STATUS_DEPENDENCIES
3082-USE_NLS
3083-MSGFMT_OPTS
3084-CATALOGS
3085-CATOBJEXT
3086-GMOFILES
3087-INSTOBJEXT
3088-INTLLIBS
3089-PO_IN_DATADIR_TRUE
3090-PO_IN_DATADIR_FALSE
3091-POFILES
3092-POSUB
3093-MKINSTALLDIRS
3094-PKG_CONFIG
3095-GTKMM_CFLAGS
3096-GTKMM_LIBS
3097-GLADEMM_CFLAGS
3098-GLADEMM_LIBS
3099-GTHREAD_CFLAGS
3100-GTHREAD_LIBS
3101-GCONFMM_CFLAGS
3102-GCONFMM_LIBS
3103-GCONFTOOL
3104-DCMTK_CFLAGS
3105-DCMTK_LIBS
3106-LDFLAGS_MINGW32
3107-LDFLAGS_AESKULAP_LIBS
3108-BUILD_NOT_MINGW32_TRUE
3109-BUILD_NOT_MINGW32_FALSE
3110-LIBOBJS
3111-LTLIBOBJS'
3112-ac_subst_files=''
3113- ac_precious_vars='build_alias
3114-host_alias
3115-target_alias
3116-CC
3117-CFLAGS
3118-LDFLAGS
3119-LIBS
3120-CPPFLAGS
3121-CPP
3122-CXX
3123-CXXFLAGS
3124-CCC
3125-CXXCPP
3126-F77
3127-FFLAGS
3128-PKG_CONFIG
3129-GTKMM_CFLAGS
3130-GTKMM_LIBS
3131-GLADEMM_CFLAGS
3132-GLADEMM_LIBS
3133-GTHREAD_CFLAGS
3134-GTHREAD_LIBS
3135-GCONFMM_CFLAGS
3136-GCONFMM_LIBS'
3137-
3138-
3139-# Initialize some variables set by options.
3140-ac_init_help=
3141-ac_init_version=false
3142-# The variables have the same names as the options, with
3143-# dashes changed to underlines.
3144-cache_file=/dev/null
3145-exec_prefix=NONE
3146-no_create=
3147-no_recursion=
3148-prefix=NONE
3149-program_prefix=NONE
3150-program_suffix=NONE
3151-program_transform_name=s,x,x,
3152-silent=
3153-site=
3154-srcdir=
3155-verbose=
3156-x_includes=NONE
3157-x_libraries=NONE
3158-
3159-# Installation directory options.
3160-# These are left unexpanded so users can "make install exec_prefix=/foo"
3161-# and all the variables that are supposed to be based on exec_prefix
3162-# by default will actually change.
3163-# Use braces instead of parens because sh, perl, etc. also accept them.
3164-# (The list follows the same order as the GNU Coding Standards.)
3165-bindir='${exec_prefix}/bin'
3166-sbindir='${exec_prefix}/sbin'
3167-libexecdir='${exec_prefix}/libexec'
3168-datarootdir='${prefix}/share'
3169-datadir='${datarootdir}'
3170-sysconfdir='${prefix}/etc'
3171-sharedstatedir='${prefix}/com'
3172-localstatedir='${prefix}/var'
3173-includedir='${prefix}/include'
3174-oldincludedir='/usr/include'
3175-docdir='${datarootdir}/doc/${PACKAGE}'
3176-infodir='${datarootdir}/info'
3177-htmldir='${docdir}'
3178-dvidir='${docdir}'
3179-pdfdir='${docdir}'
3180-psdir='${docdir}'
3181-libdir='${exec_prefix}/lib'
3182-localedir='${datarootdir}/locale'
3183-mandir='${datarootdir}/man'
3184-
3185-ac_prev=
3186-ac_dashdash=
3187-for ac_option
3188-do
3189- # If the previous option needs an argument, assign it.
3190- if test -n "$ac_prev"; then
3191- eval $ac_prev=\$ac_option
3192- ac_prev=
3193- continue
3194- fi
3195-
3196- case $ac_option in
3197- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
3198- *) ac_optarg=yes ;;
3199- esac
3200-
3201- # Accept the important Cygnus configure options, so we can diagnose typos.
3202-
3203- case $ac_dashdash$ac_option in
3204- --)
3205- ac_dashdash=yes ;;
3206-
3207- -bindir | --bindir | --bindi | --bind | --bin | --bi)
3208- ac_prev=bindir ;;
3209- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
3210- bindir=$ac_optarg ;;
3211-
3212- -build | --build | --buil | --bui | --bu)
3213- ac_prev=build_alias ;;
3214- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
3215- build_alias=$ac_optarg ;;
3216-
3217- -cache-file | --cache-file | --cache-fil | --cache-fi \
3218- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
3219- ac_prev=cache_file ;;
3220- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
3221- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
3222- cache_file=$ac_optarg ;;
3223-
3224- --config-cache | -C)
3225- cache_file=config.cache ;;
3226-
3227- -datadir | --datadir | --datadi | --datad)
3228- ac_prev=datadir ;;
3229- -datadir=* | --datadir=* | --datadi=* | --datad=*)
3230- datadir=$ac_optarg ;;
3231-
3232- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
3233- | --dataroo | --dataro | --datar)
3234- ac_prev=datarootdir ;;
3235- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
3236- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
3237- datarootdir=$ac_optarg ;;
3238-
3239- -disable-* | --disable-*)
3240- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
3241- # Reject names that are not valid shell variable names.
3242- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3243- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3244- { (exit 1); exit 1; }; }
3245- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
3246- eval enable_$ac_feature=no ;;
3247-
3248- -docdir | --docdir | --docdi | --doc | --do)
3249- ac_prev=docdir ;;
3250- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
3251- docdir=$ac_optarg ;;
3252-
3253- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
3254- ac_prev=dvidir ;;
3255- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
3256- dvidir=$ac_optarg ;;
3257-
3258- -enable-* | --enable-*)
3259- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
3260- # Reject names that are not valid shell variable names.
3261- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3262- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3263- { (exit 1); exit 1; }; }
3264- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
3265- eval enable_$ac_feature=\$ac_optarg ;;
3266-
3267- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
3268- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
3269- | --exec | --exe | --ex)
3270- ac_prev=exec_prefix ;;
3271- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
3272- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
3273- | --exec=* | --exe=* | --ex=*)
3274- exec_prefix=$ac_optarg ;;
3275-
3276- -gas | --gas | --ga | --g)
3277- # Obsolete; use --with-gas.
3278- with_gas=yes ;;
3279-
3280- -help | --help | --hel | --he | -h)
3281- ac_init_help=long ;;
3282- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
3283- ac_init_help=recursive ;;
3284- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
3285- ac_init_help=short ;;
3286-
3287- -host | --host | --hos | --ho)
3288- ac_prev=host_alias ;;
3289- -host=* | --host=* | --hos=* | --ho=*)
3290- host_alias=$ac_optarg ;;
3291-
3292- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
3293- ac_prev=htmldir ;;
3294- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
3295- | --ht=*)
3296- htmldir=$ac_optarg ;;
3297-
3298- -includedir | --includedir | --includedi | --included | --include \
3299- | --includ | --inclu | --incl | --inc)
3300- ac_prev=includedir ;;
3301- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
3302- | --includ=* | --inclu=* | --incl=* | --inc=*)
3303- includedir=$ac_optarg ;;
3304-
3305- -infodir | --infodir | --infodi | --infod | --info | --inf)
3306- ac_prev=infodir ;;
3307- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
3308- infodir=$ac_optarg ;;
3309-
3310- -libdir | --libdir | --libdi | --libd)
3311- ac_prev=libdir ;;
3312- -libdir=* | --libdir=* | --libdi=* | --libd=*)
3313- libdir=$ac_optarg ;;
3314-
3315- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
3316- | --libexe | --libex | --libe)
3317- ac_prev=libexecdir ;;
3318- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
3319- | --libexe=* | --libex=* | --libe=*)
3320- libexecdir=$ac_optarg ;;
3321-
3322- -localedir | --localedir | --localedi | --localed | --locale)
3323- ac_prev=localedir ;;
3324- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
3325- localedir=$ac_optarg ;;
3326-
3327- -localstatedir | --localstatedir | --localstatedi | --localstated \
3328- | --localstate | --localstat | --localsta | --localst | --locals)
3329- ac_prev=localstatedir ;;
3330- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
3331- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
3332- localstatedir=$ac_optarg ;;
3333-
3334- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
3335- ac_prev=mandir ;;
3336- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
3337- mandir=$ac_optarg ;;
3338-
3339- -nfp | --nfp | --nf)
3340- # Obsolete; use --without-fp.
3341- with_fp=no ;;
3342-
3343- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
3344- | --no-cr | --no-c | -n)
3345- no_create=yes ;;
3346-
3347- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
3348- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
3349- no_recursion=yes ;;
3350-
3351- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
3352- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
3353- | --oldin | --oldi | --old | --ol | --o)
3354- ac_prev=oldincludedir ;;
3355- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
3356- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
3357- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
3358- oldincludedir=$ac_optarg ;;
3359-
3360- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
3361- ac_prev=prefix ;;
3362- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
3363- prefix=$ac_optarg ;;
3364-
3365- -program-prefix | --program-prefix | --program-prefi | --program-pref \
3366- | --program-pre | --program-pr | --program-p)
3367- ac_prev=program_prefix ;;
3368- -program-prefix=* | --program-prefix=* | --program-prefi=* \
3369- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
3370- program_prefix=$ac_optarg ;;
3371-
3372- -program-suffix | --program-suffix | --program-suffi | --program-suff \
3373- | --program-suf | --program-su | --program-s)
3374- ac_prev=program_suffix ;;
3375- -program-suffix=* | --program-suffix=* | --program-suffi=* \
3376- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
3377- program_suffix=$ac_optarg ;;
3378-
3379- -program-transform-name | --program-transform-name \
3380- | --program-transform-nam | --program-transform-na \
3381- | --program-transform-n | --program-transform- \
3382- | --program-transform | --program-transfor \
3383- | --program-transfo | --program-transf \
3384- | --program-trans | --program-tran \
3385- | --progr-tra | --program-tr | --program-t)
3386- ac_prev=program_transform_name ;;
3387- -program-transform-name=* | --program-transform-name=* \
3388- | --program-transform-nam=* | --program-transform-na=* \
3389- | --program-transform-n=* | --program-transform-=* \
3390- | --program-transform=* | --program-transfor=* \
3391- | --program-transfo=* | --program-transf=* \
3392- | --program-trans=* | --program-tran=* \
3393- | --progr-tra=* | --program-tr=* | --program-t=*)
3394- program_transform_name=$ac_optarg ;;
3395-
3396- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
3397- ac_prev=pdfdir ;;
3398- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
3399- pdfdir=$ac_optarg ;;
3400-
3401- -psdir | --psdir | --psdi | --psd | --ps)
3402- ac_prev=psdir ;;
3403- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
3404- psdir=$ac_optarg ;;
3405-
3406- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
3407- | -silent | --silent | --silen | --sile | --sil)
3408- silent=yes ;;
3409-
3410- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
3411- ac_prev=sbindir ;;
3412- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
3413- | --sbi=* | --sb=*)
3414- sbindir=$ac_optarg ;;
3415-
3416- -sharedstatedir | --sharedstatedir | --sharedstatedi \
3417- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
3418- | --sharedst | --shareds | --shared | --share | --shar \
3419- | --sha | --sh)
3420- ac_prev=sharedstatedir ;;
3421- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
3422- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
3423- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
3424- | --sha=* | --sh=*)
3425- sharedstatedir=$ac_optarg ;;
3426-
3427- -site | --site | --sit)
3428- ac_prev=site ;;
3429- -site=* | --site=* | --sit=*)
3430- site=$ac_optarg ;;
3431-
3432- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
3433- ac_prev=srcdir ;;
3434- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
3435- srcdir=$ac_optarg ;;
3436-
3437- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
3438- | --syscon | --sysco | --sysc | --sys | --sy)
3439- ac_prev=sysconfdir ;;
3440- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
3441- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
3442- sysconfdir=$ac_optarg ;;
3443-
3444- -target | --target | --targe | --targ | --tar | --ta | --t)
3445- ac_prev=target_alias ;;
3446- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
3447- target_alias=$ac_optarg ;;
3448-
3449- -v | -verbose | --verbose | --verbos | --verbo | --verb)
3450- verbose=yes ;;
3451-
3452- -version | --version | --versio | --versi | --vers | -V)
3453- ac_init_version=: ;;
3454-
3455- -with-* | --with-*)
3456- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
3457- # Reject names that are not valid shell variable names.
3458- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3459- { echo "$as_me: error: invalid package name: $ac_package" >&2
3460- { (exit 1); exit 1; }; }
3461- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
3462- eval with_$ac_package=\$ac_optarg ;;
3463-
3464- -without-* | --without-*)
3465- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
3466- # Reject names that are not valid shell variable names.
3467- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3468- { echo "$as_me: error: invalid package name: $ac_package" >&2
3469- { (exit 1); exit 1; }; }
3470- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
3471- eval with_$ac_package=no ;;
3472-
3473- --x)
3474- # Obsolete; use --with-x.
3475- with_x=yes ;;
3476-
3477- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
3478- | --x-incl | --x-inc | --x-in | --x-i)
3479- ac_prev=x_includes ;;
3480- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
3481- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
3482- x_includes=$ac_optarg ;;
3483-
3484- -x-libraries | --x-libraries | --x-librarie | --x-librari \
3485- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
3486- ac_prev=x_libraries ;;
3487- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
3488- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
3489- x_libraries=$ac_optarg ;;
3490-
3491- -*) { echo "$as_me: error: unrecognized option: $ac_option
3492-Try \`$0 --help' for more information." >&2
3493- { (exit 1); exit 1; }; }
3494- ;;
3495-
3496- *=*)
3497- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
3498- # Reject names that are not valid shell variable names.
3499- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
3500- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
3501- { (exit 1); exit 1; }; }
3502- eval $ac_envvar=\$ac_optarg
3503- export $ac_envvar ;;
3504-
3505- *)
3506- # FIXME: should be removed in autoconf 3.0.
3507- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
3508- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3509- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
3510- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
3511- ;;
3512-
3513- esac
3514-done
3515-
3516-if test -n "$ac_prev"; then
3517- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
3518- { echo "$as_me: error: missing argument to $ac_option" >&2
3519- { (exit 1); exit 1; }; }
3520-fi
3521-
3522-# Be sure to have absolute directory names.
3523-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
3524- datadir sysconfdir sharedstatedir localstatedir includedir \
3525- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
3526- libdir localedir mandir
3527-do
3528- eval ac_val=\$$ac_var
3529- case $ac_val in
3530- [\\/$]* | ?:[\\/]* ) continue;;
3531- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
3532- esac
3533- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
3534- { (exit 1); exit 1; }; }
3535-done
3536-
3537-# There might be people who depend on the old broken behavior: `$host'
3538-# used to hold the argument of --host etc.
3539-# FIXME: To remove some day.
3540-build=$build_alias
3541-host=$host_alias
3542-target=$target_alias
3543-
3544-# FIXME: To remove some day.
3545-if test "x$host_alias" != x; then
3546- if test "x$build_alias" = x; then
3547- cross_compiling=maybe
3548- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
3549- If a cross compiler is detected then cross compile mode will be used." >&2
3550- elif test "x$build_alias" != "x$host_alias"; then
3551- cross_compiling=yes
3552- fi
3553-fi
3554-
3555-ac_tool_prefix=
3556-test -n "$host_alias" && ac_tool_prefix=$host_alias-
3557-
3558-test "$silent" = yes && exec 6>/dev/null
3559-
3560-
3561-ac_pwd=`pwd` && test -n "$ac_pwd" &&
3562-ac_ls_di=`ls -di .` &&
3563-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
3564- { echo "$as_me: error: Working directory cannot be determined" >&2
3565- { (exit 1); exit 1; }; }
3566-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
3567- { echo "$as_me: error: pwd does not report name of working directory" >&2
3568- { (exit 1); exit 1; }; }
3569-
3570-
3571-# Find the source files, if location was not specified.
3572-if test -z "$srcdir"; then
3573- ac_srcdir_defaulted=yes
3574- # Try the directory containing this script, then the parent directory.
3575- ac_confdir=`$as_dirname -- "$0" ||
3576-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3577- X"$0" : 'X\(//\)[^/]' \| \
3578- X"$0" : 'X\(//\)$' \| \
3579- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
3580-echo X"$0" |
3581- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
3582- s//\1/
3583- q
3584- }
3585- /^X\(\/\/\)[^/].*/{
3586- s//\1/
3587- q
3588- }
3589- /^X\(\/\/\)$/{
3590- s//\1/
3591- q
3592- }
3593- /^X\(\/\).*/{
3594- s//\1/
3595- q
3596- }
3597- s/.*/./; q'`
3598- srcdir=$ac_confdir
3599- if test ! -r "$srcdir/$ac_unique_file"; then
3600- srcdir=..
3601- fi
3602-else
3603- ac_srcdir_defaulted=no
3604-fi
3605-if test ! -r "$srcdir/$ac_unique_file"; then
3606- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
3607- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
3608- { (exit 1); exit 1; }; }
3609-fi
3610-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
3611-ac_abs_confdir=`(
3612- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
3613- { (exit 1); exit 1; }; }
3614- pwd)`
3615-# When building in place, set srcdir=.
3616-if test "$ac_abs_confdir" = "$ac_pwd"; then
3617- srcdir=.
3618-fi
3619-# Remove unnecessary trailing slashes from srcdir.
3620-# Double slashes in file names in object file debugging info
3621-# mess up M-x gdb in Emacs.
3622-case $srcdir in
3623-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
3624-esac
3625-for ac_var in $ac_precious_vars; do
3626- eval ac_env_${ac_var}_set=\${${ac_var}+set}
3627- eval ac_env_${ac_var}_value=\$${ac_var}
3628- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
3629- eval ac_cv_env_${ac_var}_value=\$${ac_var}
3630-done
3631-
3632-#
3633-# Report the --help message.
3634-#
3635-if test "$ac_init_help" = "long"; then
3636- # Omit some internal or obsolete options to make the list less imposing.
3637- # This message is too long to be a string in the A/UX 3.1 sh.
3638- cat <<_ACEOF
3639-\`configure' configures this package to adapt to many kinds of systems.
3640-
3641-Usage: $0 [OPTION]... [VAR=VALUE]...
3642-
3643-To assign environment variables (e.g., CC, CFLAGS...), specify them as
3644-VAR=VALUE. See below for descriptions of some of the useful variables.
3645-
3646-Defaults for the options are specified in brackets.
3647-
3648-Configuration:
3649- -h, --help display this help and exit
3650- --help=short display options specific to this package
3651- --help=recursive display the short help of all the included packages
3652- -V, --version display version information and exit
3653- -q, --quiet, --silent do not print \`checking...' messages
3654- --cache-file=FILE cache test results in FILE [disabled]
3655- -C, --config-cache alias for \`--cache-file=config.cache'
3656- -n, --no-create do not create output files
3657- --srcdir=DIR find the sources in DIR [configure dir or \`..']
3658-
3659-Installation directories:
3660- --prefix=PREFIX install architecture-independent files in PREFIX
3661- [$ac_default_prefix]
3662- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
3663- [PREFIX]
3664-
3665-By default, \`make install' will install all the files in
3666-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
3667-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
3668-for instance \`--prefix=\$HOME'.
3669-
3670-For better control, use the options below.
3671-
3672-Fine tuning of the installation directories:
3673- --bindir=DIR user executables [EPREFIX/bin]
3674- --sbindir=DIR system admin executables [EPREFIX/sbin]
3675- --libexecdir=DIR program executables [EPREFIX/libexec]
3676- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
3677- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
3678- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
3679- --libdir=DIR object code libraries [EPREFIX/lib]
3680- --includedir=DIR C header files [PREFIX/include]
3681- --oldincludedir=DIR C header files for non-gcc [/usr/include]
3682- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
3683- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
3684- --infodir=DIR info documentation [DATAROOTDIR/info]
3685- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3686- --mandir=DIR man documentation [DATAROOTDIR/man]
3687- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
3688- --htmldir=DIR html documentation [DOCDIR]
3689- --dvidir=DIR dvi documentation [DOCDIR]
3690- --pdfdir=DIR pdf documentation [DOCDIR]
3691- --psdir=DIR ps documentation [DOCDIR]
3692-_ACEOF
3693-
3694- cat <<\_ACEOF
3695-
3696-Program names:
3697- --program-prefix=PREFIX prepend PREFIX to installed program names
3698- --program-suffix=SUFFIX append SUFFIX to installed program names
3699- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
3700-
3701-System types:
3702- --build=BUILD configure for building on BUILD [guessed]
3703- --host=HOST cross-compile to build programs to run on HOST [BUILD]
3704-_ACEOF
3705-fi
3706-
3707-if test -n "$ac_init_help"; then
3708-
3709- cat <<\_ACEOF
3710-
3711-Optional Features:
3712- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3713- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3714- --disable-dependency-tracking speeds up one-time build
3715- --enable-dependency-tracking do not reject slow dependency extractors
3716- --enable-shared[=PKGS] build shared libraries [default=yes]
3717- --enable-static[=PKGS] build static libraries [default=yes]
3718- --enable-fast-install[=PKGS]
3719- optimize for fast installation [default=yes]
3720- --disable-libtool-lock avoid locking (might break parallel builds)
3721- --enable-binreloc compile with binary relocation support
3722- (default=enable when available)
3723- --enable-binreloc-threads compile binary relocation with threads support
3724- (default=yes)
3725- --disable-schemas-install Disable the schemas installation
3726-
3727-Optional Packages:
3728- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
3729- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
3730- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
3731- --with-pic try to use only PIC/non-PIC objects [default=use
3732- both]
3733- --with-tags[=TAGS] include additional configurations [automatic]
3734- --with-gconf-source=sourceaddress Config database for installing schema files.
3735- --with-gconf-schema-file-dir=dir Directory for installing schema files.
3736-
3737-Some influential environment variables:
3738- CC C compiler command
3739- CFLAGS C compiler flags
3740- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
3741- nonstandard directory <lib dir>
3742- LIBS libraries to pass to the linker, e.g. -l<library>
3743- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
3744- you have headers in a nonstandard directory <include dir>
3745- CPP C preprocessor
3746- CXX C++ compiler command
3747- CXXFLAGS C++ compiler flags
3748- CXXCPP C++ preprocessor
3749- F77 Fortran 77 compiler command
3750- FFLAGS Fortran 77 compiler flags
3751- PKG_CONFIG path to pkg-config utility
3752- GTKMM_CFLAGS
3753- C compiler flags for GTKMM, overriding pkg-config
3754- GTKMM_LIBS linker flags for GTKMM, overriding pkg-config
3755- GLADEMM_CFLAGS
3756- C compiler flags for GLADEMM, overriding pkg-config
3757- GLADEMM_LIBS
3758- linker flags for GLADEMM, overriding pkg-config
3759- GTHREAD_CFLAGS
3760- C compiler flags for GTHREAD, overriding pkg-config
3761- GTHREAD_LIBS
3762- linker flags for GTHREAD, overriding pkg-config
3763- GCONFMM_CFLAGS
3764- C compiler flags for GCONFMM, overriding pkg-config
3765- GCONFMM_LIBS
3766- linker flags for GCONFMM, overriding pkg-config
3767-
3768-Use these variables to override the choices made by `configure' or to help
3769-it to find libraries and programs with nonstandard names/locations.
3770-
3771-_ACEOF
3772-ac_status=$?
3773-fi
3774-
3775-if test "$ac_init_help" = "recursive"; then
3776- # If there are subdirs, report their specific --help.
3777- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
3778- test -d "$ac_dir" || continue
3779- ac_builddir=.
3780-
3781-case "$ac_dir" in
3782-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
3783-*)
3784- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
3785- # A ".." for each directory in $ac_dir_suffix.
3786- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
3787- case $ac_top_builddir_sub in
3788- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
3789- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
3790- esac ;;
3791-esac
3792-ac_abs_top_builddir=$ac_pwd
3793-ac_abs_builddir=$ac_pwd$ac_dir_suffix
3794-# for backward compatibility:
3795-ac_top_builddir=$ac_top_build_prefix
3796-
3797-case $srcdir in
3798- .) # We are building in place.
3799- ac_srcdir=.
3800- ac_top_srcdir=$ac_top_builddir_sub
3801- ac_abs_top_srcdir=$ac_pwd ;;
3802- [\\/]* | ?:[\\/]* ) # Absolute name.
3803- ac_srcdir=$srcdir$ac_dir_suffix;
3804- ac_top_srcdir=$srcdir
3805- ac_abs_top_srcdir=$srcdir ;;
3806- *) # Relative name.
3807- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
3808- ac_top_srcdir=$ac_top_build_prefix$srcdir
3809- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
3810-esac
3811-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
3812-
3813- cd "$ac_dir" || { ac_status=$?; continue; }
3814- # Check for guested configure.
3815- if test -f "$ac_srcdir/configure.gnu"; then
3816- echo &&
3817- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
3818- elif test -f "$ac_srcdir/configure"; then
3819- echo &&
3820- $SHELL "$ac_srcdir/configure" --help=recursive
3821- else
3822- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
3823- fi || ac_status=$?
3824- cd "$ac_pwd" || { ac_status=$?; break; }
3825- done
3826-fi
3827-
3828-test -n "$ac_init_help" && exit $ac_status
3829-if $ac_init_version; then
3830- cat <<\_ACEOF
3831-configure
3832-generated by GNU Autoconf 2.61
3833-
3834-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
3835-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
3836-This configure script is free software; the Free Software Foundation
3837-gives unlimited permission to copy, distribute and modify it.
3838-_ACEOF
3839- exit
3840-fi
3841-cat >config.log <<_ACEOF
3842-This file contains any messages produced by compilers while
3843-running configure, to aid debugging if configure makes a mistake.
3844-
3845-It was created by $as_me, which was
3846-generated by GNU Autoconf 2.61. Invocation command line was
3847-
3848- $ $0 $@
3849-
3850-_ACEOF
3851-exec 5>>config.log
3852-{
3853-cat <<_ASUNAME
3854-## --------- ##
3855-## Platform. ##
3856-## --------- ##
3857-
3858-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
3859-uname -m = `(uname -m) 2>/dev/null || echo unknown`
3860-uname -r = `(uname -r) 2>/dev/null || echo unknown`
3861-uname -s = `(uname -s) 2>/dev/null || echo unknown`
3862-uname -v = `(uname -v) 2>/dev/null || echo unknown`
3863-
3864-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
3865-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
3866-
3867-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
3868-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
3869-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
3870-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
3871-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
3872-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
3873-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
3874-
3875-_ASUNAME
3876-
3877-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3878-for as_dir in $PATH
3879-do
3880- IFS=$as_save_IFS
3881- test -z "$as_dir" && as_dir=.
3882- echo "PATH: $as_dir"
3883-done
3884-IFS=$as_save_IFS
3885-
3886-} >&5
3887-
3888-cat >&5 <<_ACEOF
3889-
3890-
3891-## ----------- ##
3892-## Core tests. ##
3893-## ----------- ##
3894-
3895-_ACEOF
3896-
3897-
3898-# Keep a trace of the command line.
3899-# Strip out --no-create and --no-recursion so they do not pile up.
3900-# Strip out --silent because we don't want to record it for future runs.
3901-# Also quote any args containing shell meta-characters.
3902-# Make two passes to allow for proper duplicate-argument suppression.
3903-ac_configure_args=
3904-ac_configure_args0=
3905-ac_configure_args1=
3906-ac_must_keep_next=false
3907-for ac_pass in 1 2
3908-do
3909- for ac_arg
3910- do
3911- case $ac_arg in
3912- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
3913- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
3914- | -silent | --silent | --silen | --sile | --sil)
3915- continue ;;
3916- *\'*)
3917- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
3918- esac
3919- case $ac_pass in
3920- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
3921- 2)
3922- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
3923- if test $ac_must_keep_next = true; then
3924- ac_must_keep_next=false # Got value, back to normal.
3925- else
3926- case $ac_arg in
3927- *=* | --config-cache | -C | -disable-* | --disable-* \
3928- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
3929- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
3930- | -with-* | --with-* | -without-* | --without-* | --x)
3931- case "$ac_configure_args0 " in
3932- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
3933- esac
3934- ;;
3935- -* ) ac_must_keep_next=true ;;
3936- esac
3937- fi
3938- ac_configure_args="$ac_configure_args '$ac_arg'"
3939- ;;
3940- esac
3941- done
3942-done
3943-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
3944-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
3945-
3946-# When interrupted or exit'd, cleanup temporary files, and complete
3947-# config.log. We remove comments because anyway the quotes in there
3948-# would cause problems or look ugly.
3949-# WARNING: Use '\'' to represent an apostrophe within the trap.
3950-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
3951-trap 'exit_status=$?
3952- # Save into config.log some information that might help in debugging.
3953- {
3954- echo
3955-
3956- cat <<\_ASBOX
3957-## ---------------- ##
3958-## Cache variables. ##
3959-## ---------------- ##
3960-_ASBOX
3961- echo
3962- # The following way of writing the cache mishandles newlines in values,
3963-(
3964- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
3965- eval ac_val=\$$ac_var
3966- case $ac_val in #(
3967- *${as_nl}*)
3968- case $ac_var in #(
3969- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
3970-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
3971- esac
3972- case $ac_var in #(
3973- _ | IFS | as_nl) ;; #(
3974- *) $as_unset $ac_var ;;
3975- esac ;;
3976- esac
3977- done
3978- (set) 2>&1 |
3979- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
3980- *${as_nl}ac_space=\ *)
3981- sed -n \
3982- "s/'\''/'\''\\\\'\'''\''/g;
3983- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
3984- ;; #(
3985- *)
3986- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
3987- ;;
3988- esac |
3989- sort
3990-)
3991- echo
3992-
3993- cat <<\_ASBOX
3994-## ----------------- ##
3995-## Output variables. ##
3996-## ----------------- ##
3997-_ASBOX
3998- echo
3999- for ac_var in $ac_subst_vars
4000- do
4001- eval ac_val=\$$ac_var
4002- case $ac_val in
4003- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4004- esac
4005- echo "$ac_var='\''$ac_val'\''"
4006- done | sort
4007- echo
4008-
4009- if test -n "$ac_subst_files"; then
4010- cat <<\_ASBOX
4011-## ------------------- ##
4012-## File substitutions. ##
4013-## ------------------- ##
4014-_ASBOX
4015- echo
4016- for ac_var in $ac_subst_files
4017- do
4018- eval ac_val=\$$ac_var
4019- case $ac_val in
4020- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4021- esac
4022- echo "$ac_var='\''$ac_val'\''"
4023- done | sort
4024- echo
4025- fi
4026-
4027- if test -s confdefs.h; then
4028- cat <<\_ASBOX
4029-## ----------- ##
4030-## confdefs.h. ##
4031-## ----------- ##
4032-_ASBOX
4033- echo
4034- cat confdefs.h
4035- echo
4036- fi
4037- test "$ac_signal" != 0 &&
4038- echo "$as_me: caught signal $ac_signal"
4039- echo "$as_me: exit $exit_status"
4040- } >&5
4041- rm -f core *.core core.conftest.* &&
4042- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
4043- exit $exit_status
4044-' 0
4045-for ac_signal in 1 2 13 15; do
4046- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
4047-done
4048-ac_signal=0
4049-
4050-# confdefs.h avoids OS command line length limits that DEFS can exceed.
4051-rm -f -r conftest* confdefs.h
4052-
4053-# Predefined preprocessor variables.
4054-
4055-cat >>confdefs.h <<_ACEOF
4056-#define PACKAGE_NAME "$PACKAGE_NAME"
4057-_ACEOF
4058-
4059-
4060-cat >>confdefs.h <<_ACEOF
4061-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
4062-_ACEOF
4063-
4064-
4065-cat >>confdefs.h <<_ACEOF
4066-#define PACKAGE_VERSION "$PACKAGE_VERSION"
4067-_ACEOF
4068-
4069-
4070-cat >>confdefs.h <<_ACEOF
4071-#define PACKAGE_STRING "$PACKAGE_STRING"
4072-_ACEOF
4073-
4074-
4075-cat >>confdefs.h <<_ACEOF
4076-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
4077-_ACEOF
4078-
4079-
4080-# Let the site file select an alternate cache file if it wants to.
4081-# Prefer explicitly selected file to automatically selected ones.
4082-if test -n "$CONFIG_SITE"; then
4083- set x "$CONFIG_SITE"
4084-elif test "x$prefix" != xNONE; then
4085- set x "$prefix/share/config.site" "$prefix/etc/config.site"
4086-else
4087- set x "$ac_default_prefix/share/config.site" \
4088- "$ac_default_prefix/etc/config.site"
4089-fi
4090-shift
4091-for ac_site_file
4092-do
4093- if test -r "$ac_site_file"; then
4094- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
4095-echo "$as_me: loading site script $ac_site_file" >&6;}
4096- sed 's/^/| /' "$ac_site_file" >&5
4097- . "$ac_site_file"
4098- fi
4099-done
4100-
4101-if test -r "$cache_file"; then
4102- # Some versions of bash will fail to source /dev/null (special
4103- # files actually), so we avoid doing that.
4104- if test -f "$cache_file"; then
4105- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
4106-echo "$as_me: loading cache $cache_file" >&6;}
4107- case $cache_file in
4108- [\\/]* | ?:[\\/]* ) . "$cache_file";;
4109- *) . "./$cache_file";;
4110- esac
4111- fi
4112-else
4113- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
4114-echo "$as_me: creating cache $cache_file" >&6;}
4115- >$cache_file
4116-fi
4117-
4118-# Check that the precious variables saved in the cache have kept the same
4119-# value.
4120-ac_cache_corrupted=false
4121-for ac_var in $ac_precious_vars; do
4122- eval ac_old_set=\$ac_cv_env_${ac_var}_set
4123- eval ac_new_set=\$ac_env_${ac_var}_set
4124- eval ac_old_val=\$ac_cv_env_${ac_var}_value
4125- eval ac_new_val=\$ac_env_${ac_var}_value
4126- case $ac_old_set,$ac_new_set in
4127- set,)
4128- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
4129-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
4130- ac_cache_corrupted=: ;;
4131- ,set)
4132- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
4133-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
4134- ac_cache_corrupted=: ;;
4135- ,);;
4136- *)
4137- if test "x$ac_old_val" != "x$ac_new_val"; then
4138- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
4139-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
4140- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
4141-echo "$as_me: former value: $ac_old_val" >&2;}
4142- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
4143-echo "$as_me: current value: $ac_new_val" >&2;}
4144- ac_cache_corrupted=:
4145- fi;;
4146- esac
4147- # Pass precious variables to config.status.
4148- if test "$ac_new_set" = set; then
4149- case $ac_new_val in
4150- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
4151- *) ac_arg=$ac_var=$ac_new_val ;;
4152- esac
4153- case " $ac_configure_args " in
4154- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
4155- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
4156- esac
4157- fi
4158-done
4159-if $ac_cache_corrupted; then
4160- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
4161-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
4162- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
4163-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
4164- { (exit 1); exit 1; }; }
4165-fi
4166-
4167-
4168-
4169-
4170-
4171-
4172-
4173-
4174-
4175-
4176-
4177-
4178-
4179-
4180-
4181-
4182-
4183-ac_ext=c
4184-ac_cpp='$CPP $CPPFLAGS'
4185-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4186-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4187-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4188-
4189-
4190-
4191-AESKULAP_VERSION="0.2.2-beta1"
4192-
4193-
4194-
4195-
4196-ac_config_headers="$ac_config_headers config.h"
4197-
4198-
4199-am__api_version='1.10'
4200-
4201-ac_aux_dir=
4202-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
4203- if test -f "$ac_dir/install-sh"; then
4204- ac_aux_dir=$ac_dir
4205- ac_install_sh="$ac_aux_dir/install-sh -c"
4206- break
4207- elif test -f "$ac_dir/install.sh"; then
4208- ac_aux_dir=$ac_dir
4209- ac_install_sh="$ac_aux_dir/install.sh -c"
4210- break
4211- elif test -f "$ac_dir/shtool"; then
4212- ac_aux_dir=$ac_dir
4213- ac_install_sh="$ac_aux_dir/shtool install -c"
4214- break
4215- fi
4216-done
4217-if test -z "$ac_aux_dir"; then
4218- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
4219-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
4220- { (exit 1); exit 1; }; }
4221-fi
4222-
4223-# These three variables are undocumented and unsupported,
4224-# and are intended to be withdrawn in a future Autoconf release.
4225-# They can cause serious problems if a builder's source tree is in a directory
4226-# whose full name contains unusual characters.
4227-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
4228-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
4229-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
4230-
4231-
4232-# Find a good install program. We prefer a C program (faster),
4233-# so one script is as good as another. But avoid the broken or
4234-# incompatible versions:
4235-# SysV /etc/install, /usr/sbin/install
4236-# SunOS /usr/etc/install
4237-# IRIX /sbin/install
4238-# AIX /bin/install
4239-# AmigaOS /C/install, which installs bootblocks on floppy discs
4240-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
4241-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
4242-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
4243-# OS/2's system install, which has a completely different semantic
4244-# ./install, which can be erroneously created by make from ./install.sh.
4245-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
4246-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
4247-if test -z "$INSTALL"; then
4248-if test "${ac_cv_path_install+set}" = set; then
4249- echo $ECHO_N "(cached) $ECHO_C" >&6
4250-else
4251- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4252-for as_dir in $PATH
4253-do
4254- IFS=$as_save_IFS
4255- test -z "$as_dir" && as_dir=.
4256- # Account for people who put trailing slashes in PATH elements.
4257-case $as_dir/ in
4258- ./ | .// | /cC/* | \
4259- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
4260- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
4261- /usr/ucb/* ) ;;
4262- *)
4263- # OSF1 and SCO ODT 3.0 have their own names for install.
4264- # Don't use installbsd from OSF since it installs stuff as root
4265- # by default.
4266- for ac_prog in ginstall scoinst install; do
4267- for ac_exec_ext in '' $ac_executable_extensions; do
4268- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
4269- if test $ac_prog = install &&
4270- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
4271- # AIX install. It has an incompatible calling convention.
4272- :
4273- elif test $ac_prog = install &&
4274- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
4275- # program-specific install script used by HP pwplus--don't use.
4276- :
4277- else
4278- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
4279- break 3
4280- fi
4281- fi
4282- done
4283- done
4284- ;;
4285-esac
4286-done
4287-IFS=$as_save_IFS
4288-
4289-
4290-fi
4291- if test "${ac_cv_path_install+set}" = set; then
4292- INSTALL=$ac_cv_path_install
4293- else
4294- # As a last resort, use the slow shell script. Don't cache a
4295- # value for INSTALL within a source directory, because that will
4296- # break other packages using the cache if that directory is
4297- # removed, or if the value is a relative name.
4298- INSTALL=$ac_install_sh
4299- fi
4300-fi
4301-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
4302-echo "${ECHO_T}$INSTALL" >&6; }
4303-
4304-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
4305-# It thinks the first close brace ends the variable substitution.
4306-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
4307-
4308-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
4309-
4310-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
4311-
4312-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
4313-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
4314-# Just in case
4315-sleep 1
4316-echo timestamp > conftest.file
4317-# Do `set' in a subshell so we don't clobber the current shell's
4318-# arguments. Must try -L first in case configure is actually a
4319-# symlink; some systems play weird games with the mod time of symlinks
4320-# (eg FreeBSD returns the mod time of the symlink's containing
4321-# directory).
4322-if (
4323- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
4324- if test "$*" = "X"; then
4325- # -L didn't work.
4326- set X `ls -t $srcdir/configure conftest.file`
4327- fi
4328- rm -f conftest.file
4329- if test "$*" != "X $srcdir/configure conftest.file" \
4330- && test "$*" != "X conftest.file $srcdir/configure"; then
4331-
4332- # If neither matched, then we have a broken ls. This can happen
4333- # if, for instance, CONFIG_SHELL is bash and it inherits a
4334- # broken ls alias from the environment. This has actually
4335- # happened. Such a system could not be considered "sane".
4336- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
4337-alias in your environment" >&5
4338-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
4339-alias in your environment" >&2;}
4340- { (exit 1); exit 1; }; }
4341- fi
4342-
4343- test "$2" = conftest.file
4344- )
4345-then
4346- # Ok.
4347- :
4348-else
4349- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
4350-Check your system clock" >&5
4351-echo "$as_me: error: newly created file is older than distributed files!
4352-Check your system clock" >&2;}
4353- { (exit 1); exit 1; }; }
4354-fi
4355-{ echo "$as_me:$LINENO: result: yes" >&5
4356-echo "${ECHO_T}yes" >&6; }
4357-test "$program_prefix" != NONE &&
4358- program_transform_name="s&^&$program_prefix&;$program_transform_name"
4359-# Use a double $ so make ignores it.
4360-test "$program_suffix" != NONE &&
4361- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
4362-# Double any \ or $. echo might interpret backslashes.
4363-# By default was `s,x,x', remove it if useless.
4364-cat <<\_ACEOF >conftest.sed
4365-s/[\\$]/&&/g;s/;s,x,x,$//
4366-_ACEOF
4367-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
4368-rm -f conftest.sed
4369-
4370-# expand $ac_aux_dir to an absolute path
4371-am_aux_dir=`cd $ac_aux_dir && pwd`
4372-
4373-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
4374-# Use eval to expand $SHELL
4375-if eval "$MISSING --run true"; then
4376- am_missing_run="$MISSING --run "
4377-else
4378- am_missing_run=
4379- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
4380-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
4381-fi
4382-
4383-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
4384-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
4385-if test -z "$MKDIR_P"; then
4386- if test "${ac_cv_path_mkdir+set}" = set; then
4387- echo $ECHO_N "(cached) $ECHO_C" >&6
4388-else
4389- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4390-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
4391-do
4392- IFS=$as_save_IFS
4393- test -z "$as_dir" && as_dir=.
4394- for ac_prog in mkdir gmkdir; do
4395- for ac_exec_ext in '' $ac_executable_extensions; do
4396- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
4397- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
4398- 'mkdir (GNU coreutils) '* | \
4399- 'mkdir (coreutils) '* | \
4400- 'mkdir (fileutils) '4.1*)
4401- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
4402- break 3;;
4403- esac
4404- done
4405- done
4406-done
4407-IFS=$as_save_IFS
4408-
4409-fi
4410-
4411- if test "${ac_cv_path_mkdir+set}" = set; then
4412- MKDIR_P="$ac_cv_path_mkdir -p"
4413- else
4414- # As a last resort, use the slow shell script. Don't cache a
4415- # value for MKDIR_P within a source directory, because that will
4416- # break other packages using the cache if that directory is
4417- # removed, or if the value is a relative name.
4418- test -d ./--version && rmdir ./--version
4419- MKDIR_P="$ac_install_sh -d"
4420- fi
4421-fi
4422-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
4423-echo "${ECHO_T}$MKDIR_P" >&6; }
4424-
4425-mkdir_p="$MKDIR_P"
4426-case $mkdir_p in
4427- [\\/$]* | ?:[\\/]*) ;;
4428- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
4429-esac
4430-
4431-for ac_prog in gawk mawk nawk awk
4432-do
4433- # Extract the first word of "$ac_prog", so it can be a program name with args.
4434-set dummy $ac_prog; ac_word=$2
4435-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4436-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4437-if test "${ac_cv_prog_AWK+set}" = set; then
4438- echo $ECHO_N "(cached) $ECHO_C" >&6
4439-else
4440- if test -n "$AWK"; then
4441- ac_cv_prog_AWK="$AWK" # Let the user override the test.
4442-else
4443-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4444-for as_dir in $PATH
4445-do
4446- IFS=$as_save_IFS
4447- test -z "$as_dir" && as_dir=.
4448- for ac_exec_ext in '' $ac_executable_extensions; do
4449- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4450- ac_cv_prog_AWK="$ac_prog"
4451- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4452- break 2
4453- fi
4454-done
4455-done
4456-IFS=$as_save_IFS
4457-
4458-fi
4459-fi
4460-AWK=$ac_cv_prog_AWK
4461-if test -n "$AWK"; then
4462- { echo "$as_me:$LINENO: result: $AWK" >&5
4463-echo "${ECHO_T}$AWK" >&6; }
4464-else
4465- { echo "$as_me:$LINENO: result: no" >&5
4466-echo "${ECHO_T}no" >&6; }
4467-fi
4468-
4469-
4470- test -n "$AWK" && break
4471-done
4472-
4473-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
4474-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
4475-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
4476-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
4477- echo $ECHO_N "(cached) $ECHO_C" >&6
4478-else
4479- cat >conftest.make <<\_ACEOF
4480-SHELL = /bin/sh
4481-all:
4482- @echo '@@@%%%=$(MAKE)=@@@%%%'
4483-_ACEOF
4484-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
4485-case `${MAKE-make} -f conftest.make 2>/dev/null` in
4486- *@@@%%%=?*=@@@%%%*)
4487- eval ac_cv_prog_make_${ac_make}_set=yes;;
4488- *)
4489- eval ac_cv_prog_make_${ac_make}_set=no;;
4490-esac
4491-rm -f conftest.make
4492-fi
4493-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
4494- { echo "$as_me:$LINENO: result: yes" >&5
4495-echo "${ECHO_T}yes" >&6; }
4496- SET_MAKE=
4497-else
4498- { echo "$as_me:$LINENO: result: no" >&5
4499-echo "${ECHO_T}no" >&6; }
4500- SET_MAKE="MAKE=${MAKE-make}"
4501-fi
4502-
4503-rm -rf .tst 2>/dev/null
4504-mkdir .tst 2>/dev/null
4505-if test -d .tst; then
4506- am__leading_dot=.
4507-else
4508- am__leading_dot=_
4509-fi
4510-rmdir .tst 2>/dev/null
4511-
4512-if test "`cd $srcdir && pwd`" != "`pwd`"; then
4513- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
4514- # is not polluted with repeated "-I."
4515- am__isrc=' -I$(srcdir)'
4516- # test to see if srcdir already configured
4517- if test -f $srcdir/config.status; then
4518- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
4519-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
4520- { (exit 1); exit 1; }; }
4521- fi
4522-fi
4523-
4524-# test whether we have cygpath
4525-if test -z "$CYGPATH_W"; then
4526- if (cygpath --version) >/dev/null 2>/dev/null; then
4527- CYGPATH_W='cygpath -w'
4528- else
4529- CYGPATH_W=echo
4530- fi
4531-fi
4532-
4533-
4534-# Define the identity of the package.
4535- PACKAGE=aeskulap
4536- VERSION=$AESKULAP_VERSION
4537-
4538-
4539-cat >>confdefs.h <<_ACEOF
4540-#define PACKAGE "$PACKAGE"
4541-_ACEOF
4542-
4543-
4544-cat >>confdefs.h <<_ACEOF
4545-#define VERSION "$VERSION"
4546-_ACEOF
4547-
4548-# Some tools Automake needs.
4549-
4550-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
4551-
4552-
4553-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
4554-
4555-
4556-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
4557-
4558-
4559-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
4560-
4561-
4562-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
4563-
4564-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
4565-
4566-# Installed binaries are usually stripped using `strip' when the user
4567-# run `make install-strip'. However `strip' might not be the right
4568-# tool to use in cross-compilation environments, therefore Automake
4569-# will honor the `STRIP' environment variable to overrule this program.
4570-if test "$cross_compiling" != no; then
4571- if test -n "$ac_tool_prefix"; then
4572- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4573-set dummy ${ac_tool_prefix}strip; ac_word=$2
4574-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4575-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4576-if test "${ac_cv_prog_STRIP+set}" = set; then
4577- echo $ECHO_N "(cached) $ECHO_C" >&6
4578-else
4579- if test -n "$STRIP"; then
4580- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
4581-else
4582-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4583-for as_dir in $PATH
4584-do
4585- IFS=$as_save_IFS
4586- test -z "$as_dir" && as_dir=.
4587- for ac_exec_ext in '' $ac_executable_extensions; do
4588- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4589- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
4590- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4591- break 2
4592- fi
4593-done
4594-done
4595-IFS=$as_save_IFS
4596-
4597-fi
4598-fi
4599-STRIP=$ac_cv_prog_STRIP
4600-if test -n "$STRIP"; then
4601- { echo "$as_me:$LINENO: result: $STRIP" >&5
4602-echo "${ECHO_T}$STRIP" >&6; }
4603-else
4604- { echo "$as_me:$LINENO: result: no" >&5
4605-echo "${ECHO_T}no" >&6; }
4606-fi
4607-
4608-
4609-fi
4610-if test -z "$ac_cv_prog_STRIP"; then
4611- ac_ct_STRIP=$STRIP
4612- # Extract the first word of "strip", so it can be a program name with args.
4613-set dummy strip; ac_word=$2
4614-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4615-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4616-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
4617- echo $ECHO_N "(cached) $ECHO_C" >&6
4618-else
4619- if test -n "$ac_ct_STRIP"; then
4620- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
4621-else
4622-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4623-for as_dir in $PATH
4624-do
4625- IFS=$as_save_IFS
4626- test -z "$as_dir" && as_dir=.
4627- for ac_exec_ext in '' $ac_executable_extensions; do
4628- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4629- ac_cv_prog_ac_ct_STRIP="strip"
4630- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4631- break 2
4632- fi
4633-done
4634-done
4635-IFS=$as_save_IFS
4636-
4637-fi
4638-fi
4639-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
4640-if test -n "$ac_ct_STRIP"; then
4641- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
4642-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
4643-else
4644- { echo "$as_me:$LINENO: result: no" >&5
4645-echo "${ECHO_T}no" >&6; }
4646-fi
4647-
4648- if test "x$ac_ct_STRIP" = x; then
4649- STRIP=":"
4650- else
4651- case $cross_compiling:$ac_tool_warned in
4652-yes:)
4653-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
4654-whose name does not start with the host triplet. If you think this
4655-configuration is useful to you, please write to autoconf@gnu.org." >&5
4656-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
4657-whose name does not start with the host triplet. If you think this
4658-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
4659-ac_tool_warned=yes ;;
4660-esac
4661- STRIP=$ac_ct_STRIP
4662- fi
4663-else
4664- STRIP="$ac_cv_prog_STRIP"
4665-fi
4666-
4667-fi
4668-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
4669-
4670-# We need awk for the "check" target. The system "awk" is bad on
4671-# some platforms.
4672-# Always define AMTAR for backward compatibility.
4673-
4674-AMTAR=${AMTAR-"${am_missing_run}tar"}
4675-
4676-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
4677-
4678-
4679-
4680-
4681-
4682-
4683-ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
4684-
4685-
4686-case "$target" in
4687- *cygwin* | *mingw32*)
4688- MINGW32="yes"
4689- ;;
4690- *)
4691- MINGW32="no"
4692- ;;
4693-esac
4694-
4695-DEPDIR="${am__leading_dot}deps"
4696-
4697-ac_config_commands="$ac_config_commands depfiles"
4698-
4699-
4700-am_make=${MAKE-make}
4701-cat > confinc << 'END'
4702-am__doit:
4703- @echo done
4704-.PHONY: am__doit
4705-END
4706-# If we don't find an include directive, just comment out the code.
4707-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
4708-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
4709-am__include="#"
4710-am__quote=
4711-_am_result=none
4712-# First try GNU make style include.
4713-echo "include confinc" > confmf
4714-# We grep out `Entering directory' and `Leaving directory'
4715-# messages which can occur if `w' ends up in MAKEFLAGS.
4716-# In particular we don't look at `^make:' because GNU make might
4717-# be invoked under some other name (usually "gmake"), in which
4718-# case it prints its new name instead of `make'.
4719-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
4720- am__include=include
4721- am__quote=
4722- _am_result=GNU
4723-fi
4724-# Now try BSD make style include.
4725-if test "$am__include" = "#"; then
4726- echo '.include "confinc"' > confmf
4727- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
4728- am__include=.include
4729- am__quote="\""
4730- _am_result=BSD
4731- fi
4732-fi
4733-
4734-
4735-{ echo "$as_me:$LINENO: result: $_am_result" >&5
4736-echo "${ECHO_T}$_am_result" >&6; }
4737-rm -f confinc confmf
4738-
4739-# Check whether --enable-dependency-tracking was given.
4740-if test "${enable_dependency_tracking+set}" = set; then
4741- enableval=$enable_dependency_tracking;
4742-fi
4743-
4744-if test "x$enable_dependency_tracking" != xno; then
4745- am_depcomp="$ac_aux_dir/depcomp"
4746- AMDEPBACKSLASH='\'
4747-fi
4748- if test "x$enable_dependency_tracking" != xno; then
4749- AMDEP_TRUE=
4750- AMDEP_FALSE='#'
4751-else
4752- AMDEP_TRUE='#'
4753- AMDEP_FALSE=
4754-fi
4755-
4756-
4757-ac_ext=c
4758-ac_cpp='$CPP $CPPFLAGS'
4759-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4760-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4761-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4762-if test -n "$ac_tool_prefix"; then
4763- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
4764-set dummy ${ac_tool_prefix}gcc; ac_word=$2
4765-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4766-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4767-if test "${ac_cv_prog_CC+set}" = set; then
4768- echo $ECHO_N "(cached) $ECHO_C" >&6
4769-else
4770- if test -n "$CC"; then
4771- ac_cv_prog_CC="$CC" # Let the user override the test.
4772-else
4773-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4774-for as_dir in $PATH
4775-do
4776- IFS=$as_save_IFS
4777- test -z "$as_dir" && as_dir=.
4778- for ac_exec_ext in '' $ac_executable_extensions; do
4779- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4780- ac_cv_prog_CC="${ac_tool_prefix}gcc"
4781- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4782- break 2
4783- fi
4784-done
4785-done
4786-IFS=$as_save_IFS
4787-
4788-fi
4789-fi
4790-CC=$ac_cv_prog_CC
4791-if test -n "$CC"; then
4792- { echo "$as_me:$LINENO: result: $CC" >&5
4793-echo "${ECHO_T}$CC" >&6; }
4794-else
4795- { echo "$as_me:$LINENO: result: no" >&5
4796-echo "${ECHO_T}no" >&6; }
4797-fi
4798-
4799-
4800-fi
4801-if test -z "$ac_cv_prog_CC"; then
4802- ac_ct_CC=$CC
4803- # Extract the first word of "gcc", so it can be a program name with args.
4804-set dummy gcc; ac_word=$2
4805-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4806-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4807-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
4808- echo $ECHO_N "(cached) $ECHO_C" >&6
4809-else
4810- if test -n "$ac_ct_CC"; then
4811- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4812-else
4813-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4814-for as_dir in $PATH
4815-do
4816- IFS=$as_save_IFS
4817- test -z "$as_dir" && as_dir=.
4818- for ac_exec_ext in '' $ac_executable_extensions; do
4819- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4820- ac_cv_prog_ac_ct_CC="gcc"
4821- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4822- break 2
4823- fi
4824-done
4825-done
4826-IFS=$as_save_IFS
4827-
4828-fi
4829-fi
4830-ac_ct_CC=$ac_cv_prog_ac_ct_CC
4831-if test -n "$ac_ct_CC"; then
4832- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
4833-echo "${ECHO_T}$ac_ct_CC" >&6; }
4834-else
4835- { echo "$as_me:$LINENO: result: no" >&5
4836-echo "${ECHO_T}no" >&6; }
4837-fi
4838-
4839- if test "x$ac_ct_CC" = x; then
4840- CC=""
4841- else
4842- case $cross_compiling:$ac_tool_warned in
4843-yes:)
4844-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
4845-whose name does not start with the host triplet. If you think this
4846-configuration is useful to you, please write to autoconf@gnu.org." >&5
4847-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
4848-whose name does not start with the host triplet. If you think this
4849-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
4850-ac_tool_warned=yes ;;
4851-esac
4852- CC=$ac_ct_CC
4853- fi
4854-else
4855- CC="$ac_cv_prog_CC"
4856-fi
4857-
4858-if test -z "$CC"; then
4859- if test -n "$ac_tool_prefix"; then
4860- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
4861-set dummy ${ac_tool_prefix}cc; ac_word=$2
4862-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4863-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4864-if test "${ac_cv_prog_CC+set}" = set; then
4865- echo $ECHO_N "(cached) $ECHO_C" >&6
4866-else
4867- if test -n "$CC"; then
4868- ac_cv_prog_CC="$CC" # Let the user override the test.
4869-else
4870-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4871-for as_dir in $PATH
4872-do
4873- IFS=$as_save_IFS
4874- test -z "$as_dir" && as_dir=.
4875- for ac_exec_ext in '' $ac_executable_extensions; do
4876- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4877- ac_cv_prog_CC="${ac_tool_prefix}cc"
4878- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4879- break 2
4880- fi
4881-done
4882-done
4883-IFS=$as_save_IFS
4884-
4885-fi
4886-fi
4887-CC=$ac_cv_prog_CC
4888-if test -n "$CC"; then
4889- { echo "$as_me:$LINENO: result: $CC" >&5
4890-echo "${ECHO_T}$CC" >&6; }
4891-else
4892- { echo "$as_me:$LINENO: result: no" >&5
4893-echo "${ECHO_T}no" >&6; }
4894-fi
4895-
4896-
4897- fi
4898-fi
4899-if test -z "$CC"; then
4900- # Extract the first word of "cc", so it can be a program name with args.
4901-set dummy cc; ac_word=$2
4902-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4903-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4904-if test "${ac_cv_prog_CC+set}" = set; then
4905- echo $ECHO_N "(cached) $ECHO_C" >&6
4906-else
4907- if test -n "$CC"; then
4908- ac_cv_prog_CC="$CC" # Let the user override the test.
4909-else
4910- ac_prog_rejected=no
4911-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4912-for as_dir in $PATH
4913-do
4914- IFS=$as_save_IFS
4915- test -z "$as_dir" && as_dir=.
4916- for ac_exec_ext in '' $ac_executable_extensions; do
4917- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4918- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
4919- ac_prog_rejected=yes
4920- continue
4921- fi
4922- ac_cv_prog_CC="cc"
4923- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4924- break 2
4925- fi
4926-done
4927-done
4928-IFS=$as_save_IFS
4929-
4930-if test $ac_prog_rejected = yes; then
4931- # We found a bogon in the path, so make sure we never use it.
4932- set dummy $ac_cv_prog_CC
4933- shift
4934- if test $# != 0; then
4935- # We chose a different compiler from the bogus one.
4936- # However, it has the same basename, so the bogon will be chosen
4937- # first if we set CC to just the basename; use the full file name.
4938- shift
4939- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
4940- fi
4941-fi
4942-fi
4943-fi
4944-CC=$ac_cv_prog_CC
4945-if test -n "$CC"; then
4946- { echo "$as_me:$LINENO: result: $CC" >&5
4947-echo "${ECHO_T}$CC" >&6; }
4948-else
4949- { echo "$as_me:$LINENO: result: no" >&5
4950-echo "${ECHO_T}no" >&6; }
4951-fi
4952-
4953-
4954-fi
4955-if test -z "$CC"; then
4956- if test -n "$ac_tool_prefix"; then
4957- for ac_prog in cl.exe
4958- do
4959- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4960-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4961-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4962-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4963-if test "${ac_cv_prog_CC+set}" = set; then
4964- echo $ECHO_N "(cached) $ECHO_C" >&6
4965-else
4966- if test -n "$CC"; then
4967- ac_cv_prog_CC="$CC" # Let the user override the test.
4968-else
4969-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4970-for as_dir in $PATH
4971-do
4972- IFS=$as_save_IFS
4973- test -z "$as_dir" && as_dir=.
4974- for ac_exec_ext in '' $ac_executable_extensions; do
4975- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4976- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
4977- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4978- break 2
4979- fi
4980-done
4981-done
4982-IFS=$as_save_IFS
4983-
4984-fi
4985-fi
4986-CC=$ac_cv_prog_CC
4987-if test -n "$CC"; then
4988- { echo "$as_me:$LINENO: result: $CC" >&5
4989-echo "${ECHO_T}$CC" >&6; }
4990-else
4991- { echo "$as_me:$LINENO: result: no" >&5
4992-echo "${ECHO_T}no" >&6; }
4993-fi
4994-
4995-
4996- test -n "$CC" && break
4997- done
4998-fi
4999-if test -z "$CC"; then
5000- ac_ct_CC=$CC
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches