Update WVDATADIR setting

CMakeLists.txt

@@ -42,6 +42,8 @@ find_package(utf8cpp REQUIRED)
 configure_file("src/odr/internal/project_info.cpp.in" "src/odr/internal/project_info.cpp")
 configure_file("src/odr/internal/project_info.hpp.in" "src/odr/internal/project_info.hpp")
 
+configure_file("src/wvWare.h.in" "src/wvWare.h")
+
 set(PRE_CONFIGURE_FILE "src/odr/internal/git_info.cpp.in")
 set(POST_CONFIGURE_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/odr/internal/git_info.cpp")
 if (EXISTS "${PROJECT_SOURCE_DIR}/.git")

conanfile.py

@@ -69,6 +69,8 @@ def generate(self):
         tc.variables["ODR_TEST"] = False
         tc.variables["WITH_PDF2HTMLEX"] = self.options.get_safe("with_pdf2htmlEX", False)
         tc.variables["WITH_WVWARE"] = self.options.get_safe("with_wvWare", False)
+        if self.options.get_safe("with_wvWare", False):
+            tc.variables["WVDATADIR"] = self.dependencies['wvware'].cpp_info.resdirs[0]
         tc.generate()
 
         deps = CMakeDeps(self)

src/odr/internal/project_info.hpp.in

@@ -6,6 +6,6 @@ const char *version() noexcept;
 } // namespace odr::internal::project_info
 
 #cmakedefine WITH_PDF2HTMLEX 1
-#cmakedefine WITH_WVWARE 1
+#include <wvWare.h>
 
 #endif // ODR_INTERNAL_PROJECT_INFO_HPP

src/wvWare.c

@@ -27,6 +27,8 @@
 #include <wv/wv.h>
 #include "getopt.h"
 
+#include <wvWare.h>
+
 #ifdef __ANDROID_API__
 #include <android/log.h>
 #define ParenthesesStripper(...) __VA_ARGS__
@@ -48,8 +50,6 @@
 #define wvTrace( args )
 #endif
 
-char *s_WVDATADIR = NULL;
-char *s_HTMLCONFIG = NULL;
 int documentId = 0;
 
 #define static_reinit( variable, defaultValue ) { \
@@ -1748,6 +1748,15 @@ myCharProc (wvParseStruct * ps, U16 eachchar, U8 chartype, U16 lid)
     return (0);
 }
 
+const char *get_data_dir()
+{
+  const char *data_dir = getenv("WVDATADIR");
+  if (NULL == data_dir) {
+    data_dir = WVDATADIR;
+  }
+  return data_dir;
+}
+
 int
 wvOpenConfig (state_data *myhandle,char *config)
 {
@@ -1765,18 +1774,18 @@ wvOpenConfig (state_data *myhandle,char *config)
         if (NULL != buf) {
           free(buf);
         }
-	      buf = strdup_and_append_twice(s_WVDATADIR, "/", config);
+	      buf = strdup_and_append_twice(get_data_dir(), "/", config);
 	config = buf;
 	tmp = fopen(config, "rb");
     }
 
     if (tmp == NULL)
       {
+          char * html_config = strdup_and_append_twice(get_data_dir(), "/", "wvHtml.xml");
 	  if (i)
 	      wvError (
-		       ("Attempt to open %s failed, using %s\n", config,
-			s_HTMLCONFIG));
-	  config = s_HTMLCONFIG;
+		       ("Attempt to open %s failed, using %s\n", config, html_config));
+	  config = html_config;
 	  tmp = fopen (config, "rb");
       }
     myhandle->path = config;

src/wvWare.h.in

@@ -0,0 +1,7 @@
+#ifndef WVWARE_H
+#define WVWARE_H
+
+#cmakedefine WITH_WVWARE 1
+#cmakedefine WVDATADIR "@WVDATADIR@"
+
+#endif //WVWARE_H