From: johan <johan>
Date: Mon, 17 Feb 2003 14:50:13 +0000 (+0000)
Subject: added dictionnary installation in autoconf
X-Git-Tag: April2003~41
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0ba680a668e29ec5f58a2cf9af862be253c51055;hp=953fdb8435f0957ba61cf9f0154ed0dc67d53981;p=gdcm.git

added dictionnary installation in autoconf
---

diff --git a/Dicts/.cvsignore b/Dicts/.cvsignore
new file mode 100644
index 00000000..282522db
--- /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
index 00000000..610ab8a0
--- /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 93175fdc..a3a19c18 100644
--- 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 75710ec1..d59dfb02 100644
--- 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 ae54fef0..c5506f18 100644
--- 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 1c3c0a77..e24e8d0a 100644
--- 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 bc84810a..9ad0f4cf 100644
--- 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