Changeset ce7435 in git

Timestamp:

Jun 22, 2022, 2:03:14 AM (22 months ago)

Author:

François Bissey <frp.bissey@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

db3d4e1062e3b60792dbfa98a8e9bf7c355df9d2

Parents:

a2c07bb1b1f37fa39b516469f4e2b820528b29ea

Message:

Make htmldir properly configurable by having its value used in feResource.cc. To make relocation possible, the location value is made relative to "%D".

Files:

• m4/options.m4 (modified) (1 diff)
• resources/configure.ac (modified) (1 diff)
• resources/feResource.cc (modified) (1 diff)

m4/options.m4

@@ -173 +173 @@
   AC_SUBST(RESOURCES_LIBS)
 
+# If htmldir is the default value, make sure it is passed to resources' configure so that a correct default value is used.
+# if htmldir is set when calling configure, its value is passed by AC_CONFIG_SUBDIRS to resources' configure without manual intervention.
+  if test "x$htmldir" = "x\${docdir}"; then 
+    DEFAULT_HTMLDIR="--htmldir=$datarootdir/doc/singular"
+  fi
+
   ENABLE_ARG="--with-Singular RESOURCES_LIBS='$RESOURCES_LIBS' RESOURCES_INCLUDES='$RESOURCES_INCLUDES'"
 
-  ac_configure_args="$ac_configure_args $ENABLE_ARG"
+  ac_configure_args="$ac_configure_args $DEFAULT_HTMLDIR $ENABLE_ARG"
 
   PKG_REQUIRE="$PKG_REQUIRE singular_resources"

resources/configure.ac

@@ -73 +73 @@
 AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
 
+AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
+AX_NORMALIZE_PATH([config_htmldir],['/'])
+AX_COMPUTE_RELATIVE_PATHS([config_datadir:config_htmldir:data_to_html])
+AC_DEFINE_UNQUOTED([DATA_TO_HTML_DIR],"%D/$data_to_html",[htmldir])
+
 AC_CONFIG_FILES([singular_resources.pc Makefile])
 AC_OUTPUT

resources/feResource.cc

@@ -79 +79 @@
   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%D/info/singular.info", (char *)""},
   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%D/singular/singular.idx",  (char *)""},
-  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%D/singular/html",              (char *)""},
+  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    DATA_TO_HTML_DIR,       (char *)""},
   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "https://www.singular.uni-kl.de/Manual/",    (char *)""},
   {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},