44 lines
1.6 KiB
Plaintext
44 lines
1.6 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.7 2007/05/20 19:44:47 steven Exp $
|
|
--- configure.ac.orig Sat Apr 28 02:41:46 2007
|
|
+++ configure.ac Wed May 16 17:42:57 2007
|
|
@@ -354,9 +354,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with_modules" != '
|
|
# Enable building/use of libltdl if we are building shared libraries regardless
|
|
# of whether modules are built or not.
|
|
with_ltdl='no'
|
|
-if test "$libtool_build_shared_libs" != 'no' ; then
|
|
- with_ltdl='yes'
|
|
-fi
|
|
+#if test "$libtool_build_shared_libs" != 'no' ; then
|
|
+# with_ltdl='yes'
|
|
+#fi
|
|
|
|
AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no')
|
|
if test "$with_ltdl" != 'no' ; then
|
|
@@ -1997,7 +1997,7 @@ AC_SUBST(PERLMAINCC)
|
|
#
|
|
|
|
# Subdirectory under lib to place ImageMagick lib files
|
|
-MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+MagickLibSubdir="${PACKAGE_NAME}"
|
|
AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib where ImageMagick architecture dependent files are installed)
|
|
|
|
# Path to ImageMagick bin directory
|
|
@@ -2055,7 +2055,7 @@ AC_SUBST(MagickFilterModulesPath)
|
|
|
|
#
|
|
# Path to ImageMagick document files
|
|
-MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+MagickDocumentSubdir="${PACKAGE_NAME}"
|
|
MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
|
|
MagickDocumentPathDefine="${MagickDocumentPath}/"
|
|
if test "$native_win32_build" = 'yes'; then
|
|
@@ -2066,7 +2066,7 @@ AC_SUBST(MagickDocumentPath)
|
|
|
|
#
|
|
# Path to ImageMagick share files
|
|
-MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+MagickShareSubdir="${PACKAGE_NAME}"
|
|
MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
|
|
MagickSharePathDefine="${MagickSharePath}/"
|
|
if test "$native_win32_build" = 'yes'; then
|