added dictionnary installation in autoconf

diff --git a/Dicts/.cvsignore b/Dicts/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/Dicts/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/Dicts/Makefile.am b/Dicts/Makefile.am
new file mode 100644 (file)
index 0000000..610ab8a
--- /dev/null
+++ b/Dicts/Makefile.am
@@ -0,0 +1,2 @@
+dictsdir = $(prefix)/dicts
+dicts_DATA = dicomV3.dic README

diff --git a/Makefile.am b/Makefile.am
index 93175fdcb3e4156c339ae9e18f4b13c299a324da..a3a19c188b3a04eb789878536c777fe49f0d59c1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src Test
+SUBDIRS = src Test Dicts
 
 release:
        $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)

diff --git a/configure.in b/configure.in
index 75710ec1ba30ec322005c98ab8171256df9418e6..d59dfb02bb56bcb2aa416f3be8feb7f9a198dc66 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,4 +41,5 @@ dnl produce Makefile.in files
 AC_OUTPUT([
 Makefile 
 src/Makefile
-Test/Makefile])
+Test/Makefile
+Dicts/Makefile])

diff --git a/src/Makefile.am b/src/Makefile.am
index ae54fef0bf5a795d27f15a5114ff52a9f68b99a0..c5506f186876a59277010ef355e49f04192dcdb4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,8 @@ LTVERSION = 0:1:0
 
 lib_LTLIBRARIES = libgdcm.la
 
+CXXFLAGS = -DPUB_DICT_PATH=\"$(prefix)/dicts/\"
+
 libgdcm_la_SOURCES=            \
        gdcmException.cxx       \
        gdcmUtil.cxx            \

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 1c3c0a7781af7f43b6126bb75acd3754b3854010..e24e8d0a9a3f4237bf89db1720bc65eb931db82d 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -6,7 +6,9 @@
 #include "gdcmUtil.h"
 
 #define PUB_DICT_NAME     "DicomV3Dict"
-#define PUB_DICT_PATH     "../Dicts/"
+#ifndef PUB_DICT_PATH
+#  define PUB_DICT_PATH     "../Dicts/"
+#endif
 #define PUB_DICT_FILENAME "dicomV3.dic"
 
 gdcmDictSet::gdcmDictSet(void) {

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index bc84810a181bc98e303d18f4e39383be899ab47c..9ad0f4cf73f7969959cd6f19dae2333f63fe9a9e 100644 (file)
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -17,6 +17,7 @@ catch(...) {
 #endif
 
 
+
 void gdcmException::fatal(const char *from) throw() {
   try {
     cerr << "Fatal: exception received in " << from