62e5afbda7
- explicitly disable lqr (experimental liquid rescale) - fix for building no_x11 FLAVOR with ImageMagick already installed noticed by and previous ok kili@, ok naddy@
39 lines
1.2 KiB
Plaintext
39 lines
1.2 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2008/11/29 05:00:20 okan Exp $
|
|
--- configure.orig Fri Nov 14 12:33:21 2008
|
|
+++ configure Wed Nov 26 18:33:17 2008
|
|
@@ -20808,6 +20808,7 @@ with_ltdl='no'
|
|
if test "$libtool_build_shared_libs" != 'no'; then
|
|
with_ltdl='yes'
|
|
fi
|
|
+with_ltdl='no'
|
|
|
|
if test "$with_ltdl" != 'no'; then
|
|
WITH_LTDL_TRUE=
|
|
@@ -42154,7 +42155,7 @@ fi
|
|
#
|
|
|
|
# Subdirectory under lib to place ImageMagick lib files
|
|
-LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}"
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define LIBRARY_RELATIVE_PATH "$LIBRARY_RELATIVE_PATH"
|
|
@@ -42258,7 +42259,7 @@ _ACEOF
|
|
|
|
#
|
|
# Path to ImageMagick documentation files
|
|
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
|
|
DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
|
|
DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
|
|
case "${build_os}" in
|
|
@@ -42275,7 +42276,7 @@ _ACEOF
|
|
|
|
#
|
|
# Path to ImageMagick share files
|
|
-SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+SHARE_RELATIVE_PATH="${PACKAGE_NAME}"
|
|
SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
|
|
DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
|
|
case "${build_os}" in
|