Po-Chuan Hsieh
95 lines
2.9 KiB
Plaintext
95 lines
2.9 KiB
Plaintext
--- configure.orig 2025-10-29 15:50:28 UTC
|
|
+++ configure
|
|
@@ -14945,7 +14945,6 @@ fi
|
|
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
|
freebsd* | dragonfly* | midnightbsd*)
|
|
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
- hardcode_libdir_flag_spec='-R$libdir'
|
|
hardcode_direct=yes
|
|
hardcode_shlibpath_var=no
|
|
;;
|
|
@@ -28387,65 +28386,6 @@ else
|
|
X_CFLAGS="$X_CFLAGS -I$x_includes"
|
|
fi
|
|
|
|
- # It would also be nice to do this for all -L options, not just this one.
|
|
- if test -n "$x_libraries"; then
|
|
- X_LIBS="$X_LIBS -L$x_libraries"
|
|
- # For Solaris; some versions of Sun CC require a space after -R and
|
|
- # others require no space. Words are not sufficient . . . .
|
|
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
|
|
-printf %s "checking whether -R must be followed by a space... " >&6; }
|
|
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
|
|
- ac_xsave_c_werror_flag=$ac_c_werror_flag
|
|
- ac_c_werror_flag=yes
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main (void)
|
|
-{
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"
|
|
-then :
|
|
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-printf "%s\n" "no" >&6; }
|
|
- X_LIBS="$X_LIBS -R$x_libraries"
|
|
-else case e in #(
|
|
- e) LIBS="$ac_xsave_LIBS -R $x_libraries"
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main (void)
|
|
-{
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"
|
|
-then :
|
|
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
-printf "%s\n" "yes" >&6; }
|
|
- X_LIBS="$X_LIBS -R $x_libraries"
|
|
-else case e in #(
|
|
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
|
|
-printf "%s\n" "neither works" >&6; } ;;
|
|
-esac
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
- conftest$ac_exeext conftest.$ac_ext ;;
|
|
-esac
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
- ac_c_werror_flag=$ac_xsave_c_werror_flag
|
|
- LIBS=$ac_xsave_LIBS
|
|
- fi
|
|
-
|
|
# Check for system-dependent libraries X programs must link with.
|
|
# Do this before checking for the system-independent R6 libraries
|
|
# (-lICE), since we may need -lsocket or whatever for X linking.
|
|
@@ -33803,7 +33743,7 @@ fi
|
|
#
|
|
|
|
# Subdirectory under lib to place GraphicsMagick lib files
|
|
-MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+MagickLibSubdir="${PACKAGE_NAME}"
|
|
|
|
printf "%s\n" "#define MagickLibSubdir \"$MagickLibSubdir\"" >>confdefs.h
|
|
|
|
@@ -33889,7 +33829,7 @@ printf "%s\n" "#define MagickFilterModulesPath \"$Magi
|
|
|
|
#
|
|
# Path to GraphicsMagick share files
|
|
-MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+MagickShareSubdir="${PACKAGE_NAME}"
|
|
MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
|
|
MagickSharePathDefine="${MagickSharePath}/"
|
|
case "${build_os}" in
|