4fcfaad7e9
may not all be necessary, but this unbreaks things and we can revise later with okan@ and naddy@, ok okan@
44 lines
1.3 KiB
Plaintext
44 lines
1.3 KiB
Plaintext
$OpenBSD: patch-configure,v 1.7 2012/06/19 12:46:12 sthen Exp $
|
|
--- configure.orig Sun Jun 10 17:13:41 2012
|
|
+++ configure Tue Jun 19 09:17:08 2012
|
|
@@ -9655,10 +9655,12 @@ else
|
|
PTHREAD_CC="$CC"
|
|
fi
|
|
|
|
+MAGICK_PCFLAGS="$MAGICK_PCFLAGS $PTHREAD_CFLAGS"
|
|
|
|
|
|
|
|
|
|
+
|
|
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
|
|
if test x"$ax_pthread_ok" = xyes; then
|
|
|
|
@@ -32576,7 +32578,7 @@ _ACEOF
|
|
|
|
|
|
# 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"
|
|
@@ -32659,7 +32661,7 @@ _ACEOF
|
|
|
|
#
|
|
# Path to ImageMagick documentation files
|
|
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
|
|
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
|
|
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
|
|
case "${build_os}" in
|
|
@@ -35736,7 +35738,7 @@ MAGICK_CFLAGS=$CFLAGS
|
|
MAGICK_CXXFLAGS="$CXXFLAGS"
|
|
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
|
|
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
|
|
-MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
|
|
+MAGICK_LDFLAGS="$LDFLAGS"
|
|
MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
|
|
|
|
|