LIBRARY_PATH is reserved, use LIBRARY_ABSOLUTE_PATH instead

ImageMagick · Sep 14, 2024 · bf69fec · bf69fec
1 parent 0c69754
commit bf69fec
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 30 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -3112,8 +3112,8 @@ LIBEXEC_DIR = @LIBEXEC_DIR@
 LIBOBJS = @LIBOBJS@
 LIBOPENJP2_CFLAGS = @LIBOPENJP2_CFLAGS@
 LIBOPENJP2_LIBS = @LIBOPENJP2_LIBS@
+LIBRARY_ABSOLUTE_PATH = @LIBRARY_ABSOLUTE_PATH@
 LIBRARY_EXTRA_CPPFLAGS = @LIBRARY_EXTRA_CPPFLAGS@
-LIBRARY_PATH = @LIBRARY_PATH@
 LIBS = @LIBS@
 LIBSTDCLDFLAGS = @LIBSTDCLDFLAGS@
 LIBTOOL = @LIBTOOL@

diff --git a/config/config.h.in b/config/config.h.in
@@ -721,7 +721,7 @@
 #undef LIBOPENJP2_DELEGATE
 
 /* Directory where architecture-dependent files live. */
-#undef LIBRARY_PATH
+#undef LIBRARY_ABSOLUTE_PATH
 
 /* Subdirectory of lib where ImageMagick architecture dependent files are
    installed. */

diff --git a/config/configure.xml.in b/config/configure.xml.in
@@ -31,7 +31,7 @@
   <configure name="HOST" value="@host@"/>
   <configure name="INCLUDE_PATH" value="@INCLUDE_PATH@"/>
   <configure name="LDFLAGS" value="@MAGICK_LDFLAGS@"/>
-  <configure name="LIBRARY_PATH" value="@LIBRARY_PATH@"/>
+  <configure name="LIBRARY_ABSOLUTE_PATH" value="@LIBRARY_ABSOLUTE_PATH@"/>
   <configure name="LIBS" value="@MAGICK_LIBS@"/>
   <configure name="LIB_VERSION_NUMBER" value="@PACKAGE_LIB_VERSION_NUMBER@"/>
   <configure name="LIB_VERSION" value="@PACKAGE_LIB_VERSION@"/>

diff --git a/configure b/configure
@@ -777,7 +777,7 @@ LIB_BIN_DIR_PATH
 LIB_BIN_DIR_RELATIVE_PATH
 LIB_BIN_DIR
 LIB_BIN_BASEDIRNAME
-LIBRARY_PATH
+LIBRARY_ABSOLUTE_PATH
 EXECUTABLE_PATH
 INCLUDEARCH_PATH
 INCLUDE_PATH
@@ -5143,7 +5143,7 @@ MAGICK_PATCHLEVEL_VERSION=17
 
 MAGICK_VERSION=6.9.13-17
 
-MAGICK_GIT_REVISION=d2fdaa61f:20240901
+MAGICK_GIT_REVISION=0c69754b7:20240913
 
 
 # Substitute library versioning
@@ -5177,7 +5177,7 @@ PACKAGE_LIB_VERSION=0x69D
 
 PACKAGE_LIB_VERSION_NUMBER=6,9,13,17
 
-PACKAGE_RELEASE_DATE=2024-09-01
+PACKAGE_RELEASE_DATE=2024-09-13
 
 
 # Ensure that make can run correctly
@@ -34254,15 +34254,15 @@ printf "%s\n" "#define EXECUTABLE_PATH \"$DEFINE_EXECUTABLE_PATH\"" >>confdefs.h
 
 
 # Path to ImageMagick lib
-LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
-DEFINE_LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/"
+LIBRARY_ABSOLUTE_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
+DEFINE_LIBRARY_ABSOLUTE_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
-    DEFINE_LIBRARY_PATH=`$WinPathScript "$DEFINE_LIBRARY_PATH" 1`
+    DEFINE_LIBRARY_ABSOLUTE_PATH=`$WinPathScript "$DEFINE_LIBRARY_ABSOLUTE_PATH" 1`
     ;;
 esac
 
-printf "%s\n" "#define LIBRARY_PATH \"$DEFINE_LIBRARY_PATH\"" >>confdefs.h
+printf "%s\n" "#define LIBRARY_ABSOLUTE_PATH \"$DEFINE_LIBRARY_ABSOLUTE_PATH\"" >>confdefs.h
 
 
 
@@ -34283,7 +34283,7 @@ fi
 
 LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
 
-LIB_BIN_DIR_PATH="${LIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
+LIB_BIN_DIR_PATH="${LIBRARY_ABSOLUTE_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
 
 
 #
@@ -34307,7 +34307,7 @@ fi
 
 MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
 
-MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
+MODULES_PATH="${LIBRARY_ABSOLUTE_PATH}/${MODULES_RELATIVE_PATH}"
 
 
 #
@@ -34429,7 +34429,7 @@ fi
 
 SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
 
-SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
+SHAREARCH_PATH="${LIBRARY_ABSOLUTE_PATH}/${SHAREARCH_RELATIVE_PATH}"
 
 
 #

diff --git a/configure.ac b/configure.ac
@@ -2966,15 +2966,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher
 AC_SUBST([EXECUTABLE_PATH])
 
 # Path to ImageMagick lib
-LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
-DEFINE_LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/"
+LIBRARY_ABSOLUTE_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
+DEFINE_LIBRARY_ABSOLUTE_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
-    DEFINE_LIBRARY_PATH=`$WinPathScript "$DEFINE_LIBRARY_PATH" 1`
+    DEFINE_LIBRARY_ABSOLUTE_PATH=`$WinPathScript "$DEFINE_LIBRARY_ABSOLUTE_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED([LIBRARY_PATH],["$DEFINE_LIBRARY_PATH"],[Directory where architecture-dependent files live.])
-AC_SUBST([LIBRARY_PATH])
+AC_DEFINE_UNQUOTED([LIBRARY_ABSOLUTE_PATH],["$DEFINE_LIBRARY_ABSOLUTE_PATH"],[Directory where architecture-dependent files live.])
+AC_SUBST([LIBRARY_ABSOLUTE_PATH])
 
 #
 # path to local binaries
@@ -2991,7 +2991,7 @@ AC_SUBST([LIB_BIN_DIR])
 
 LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
 AC_SUBST([LIB_BIN_DIR_RELATIVE_PATH])
-LIB_BIN_DIR_PATH="${LIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
+LIB_BIN_DIR_PATH="${LIBRARY_ABSOLUTE_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
 AC_SUBST([LIB_BIN_DIR_PATH])
 
 #
@@ -3011,7 +3011,7 @@ AC_SUBST([MODULES_DIRNAME])
 
 MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
 AC_SUBST([MODULES_RELATIVE_PATH])
-MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
+MODULES_PATH="${LIBRARY_ABSOLUTE_PATH}/${MODULES_RELATIVE_PATH}"
 AC_SUBST([MODULES_PATH])
 
 #
@@ -3104,7 +3104,7 @@ AC_SUBST([SHAREARCH_DIRNAME])
 
 SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
 AC_SUBST([SHAREARCH_RELATIVE_PATH])
-SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
+SHAREARCH_PATH="${LIBRARY_ABSOLUTE_PATH}/${SHAREARCH_RELATIVE_PATH}"
 AC_SUBST([SHAREARCH_PATH])
 
 #

diff --git a/magick/deprecate.c b/magick/deprecate.c
@@ -2590,14 +2590,14 @@ MagickExport void *GetConfigureBlob(const char *filename,char *path,
   blob=(void *) NULL;
   (void) CopyMagickString(path,filename,MaxTextExtent);
 #if defined(MAGICKCORE_INSTALLED_SUPPORT)
-#if defined(MAGICKCORE_LIBRARY_PATH)
+#if defined(MAGICKCORE_LIBRARY_ABSOLUTE_PATH)
   if (blob == (void *) NULL)
     {
       /*
         Search hard coded paths.
       */
       (void) FormatLocaleString(path,MaxTextExtent,"%s%s",
-        MAGICKCORE_LIBRARY_PATH,filename);
+        MAGICKCORE_LIBRARY_ABSOLUTE_PATH,filename);
       if (IsPathAccessible(path) != MagickFalse)
         blob=FileToBlob(path,~0UL,length,exception);
     }

diff --git a/magick/magick-config.h b/magick/magick-config.h
@@ -110,7 +110,7 @@ extern "C" {
 #endif
 
 #ifndef MAGICKCORE_MODULES_PATH
-#  define MAGICKCORE_MODULES_PATH MAGICKCORE_LIBRARY_PATH MAGICKCORE_DIR_SEPARATOR MAGICKCORE_MODULES_DIRNAME
+#  define MAGICKCORE_MODULES_PATH MAGICKCORE_LIBRARY_ABSOLUTE_PATH MAGICKCORE_DIR_SEPARATOR MAGICKCORE_MODULES_DIRNAME
 #endif
 
 #ifndef MAGICKCORE_MODULES_RELATIVE_PATH
@@ -149,7 +149,7 @@ extern "C" {
 #endif
 
 #ifndef MAGICKCORE_SHAREARCH_PATH
-#  define MAGICKCORE_SHAREARCH_PATH MAGICKCORE_LIBRARY_PATH MAGICKCORE_DIR_SEPARATOR MAGICKCORE_SHAREARCH_DIRNAME MAGICKCORE_DIR_SEPARATOR
+#  define MAGICKCORE_SHAREARCH_PATH MAGICKCORE_LIBRARY_ABSOLUTE_PATH MAGICKCORE_DIR_SEPARATOR MAGICKCORE_SHAREARCH_DIRNAME MAGICKCORE_DIR_SEPARATOR
 #endif
 
 #ifndef MAGICKCORE_SHAREARCH_RELATIVE_PATH

diff --git a/magick/studio.h b/magick/studio.h
@@ -288,7 +288,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define Exit  exit
 #  define IsBasenameSeparator(c) \
   (((c) == ']') || ((c) == ':') || ((c) == '/') ? MagickTrue : MagickFalse)
-#  define MAGICKCORE_LIBRARY_PATH  "sys$login:"
+#  define MAGICKCORE_LIBRARY_ABSOLUTE_PATH  "sys$login:"
 #  define MAGICKCORE_SHARE_PATH  "sys$login:"
 #  define X11_PREFERENCES_PATH  "decw$user_defaults:"
 #  define ProcessPendingEvents(text)
@@ -313,7 +313,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define DirectoryListSeparator  ';'
 #  define EditorOptions ""
 #  define IsBasenameSeparator(c)  ((c) == ':' ? MagickTrue : MagickFalse)
-#  define MAGICKCORE_LIBRARY_PATH  ""
+#  define MAGICKCORE_LIBRARY_ABSOLUTE_PATH  ""
 #  define MAGICKCORE_SHARE_PATH  ""
 #  define X11_PREFERENCES_PATH  "~/."
 #  if defined(DISABLE_SIOUX)

diff --git a/wand/studio.h b/wand/studio.h
@@ -271,7 +271,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define Exit  exit
 #  define IsBasenameSeparator(c) \
   (((c) == ']') || ((c) == ':') || ((c) == '/') ? MagickTrue : MagickFalse)
-#  define MAGICKCORE_LIBRARY_PATH  "sys$login:"
+#  define MAGICKCORE_LIBRARY_ABSOLUTE_PATH  "sys$login:"
 #  define MAGICKCORE_SHARE_PATH  "sys$login:"
 #  define X11_PREFERENCES_PATH  "decw$user_defaults:"
 #  define ProcessPendingEvents(text)
@@ -296,7 +296,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define DirectoryListSeparator  ';'
 #  define EditorOptions ""
 #  define IsBasenameSeparator(c)  ((c) == ':' ? MagickTrue : MagickFalse)
-#  define MAGICKCORE_LIBRARY_PATH  ""
+#  define MAGICKCORE_LIBRARY_ABSOLUTE_PATH  ""
 #  define MAGICKCORE_SHARE_PATH  ""
 #  define X11_PREFERENCES_PATH  "~/."
 #  if defined(DISABLE_SIOUX)

diff --git a/www/source/configure.xml b/www/source/configure.xml
@@ -31,7 +31,7 @@
   <configure name="HOST" value="x86_64-pc-linux-gnu"/>
   <configure name="INCLUDE_PATH" value="/usr/local/include/ImageMagick-7"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib  "/>
-  <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.7"/>
+  <configure name="LIBRARY_ABSOLUTE_PATH" value="/usr/local/lib/ImageMagick-7.0.7"/>
   <configure name="LIBS" value=" -llcms2  -lfreetype    -lfftw3   -lfontconfig -lfreetype  -lXext   -lSM -lICE -lX11  -lXt -llzma  -lbz2 -lz  -lltdl  -lm -lgomp    "/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,7,15"/>
   <configure name="LIB_VERSION" value="0x707"/>