f6a13dc9de
The shared library versions changed, so bump all the ports that depend on GraphicsMagick by default too. PR: 200304 Submitted by: ports fury
108 lines
3.4 KiB
Text
108 lines
3.4 KiB
Text
--- configure.orig 2015-02-28 20:53:46 UTC
|
|
+++ configure
|
|
@@ -13277,7 +13277,6 @@ fi
|
|
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
|
freebsd* | dragonfly*)
|
|
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
|
|
;;
|
|
@@ -24497,60 +24496,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 . . . .
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
|
|
-$as_echo_n "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 ()
|
|
-{
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"; then :
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
- X_LIBS="$X_LIBS -R$x_libraries"
|
|
-else
|
|
- LIBS="$ac_xsave_LIBS -R $x_libraries"
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"; then :
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
-$as_echo "yes" >&6; }
|
|
- X_LIBS="$X_LIBS -R $x_libraries"
|
|
-else
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
|
|
-$as_echo "neither works" >&6; }
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext \
|
|
- 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
|
|
@@ -25245,15 +25190,16 @@ fi
|
|
# Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.
|
|
# Adobe DPS (as delivered on Solaris) doesn't require -lXt.
|
|
# GraphicsMagick itself doesn't use -lXt.
|
|
+ # in FreeBSD < 10, libXt is added by the linker, bot on >= 10
|
|
have_libdps='no'
|
|
- LIBDPS_XT=''
|
|
+ LIBDPS_XT='-lXt'
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPSInitialize in -ldps" >&5
|
|
$as_echo_n "checking for DPSInitialize in -ldps... " >&6; }
|
|
if ${ac_cv_lib_dps_DPSInitialize+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-ldps $LIBS"
|
|
+LIBS="-ldps $LIBDPS_XT $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -27703,7 +27649,7 @@ fi
|
|
#
|
|
|
|
# Subdirectory under lib to place GraphicsMagick lib files
|
|
-MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+MagickLibSubdir="${PACKAGE_NAME}"
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define MagickLibSubdir "$MagickLibSubdir"
|
|
@@ -27807,7 +27753,7 @@ _ACEOF
|
|
|
|
#
|
|
# Path to GraphicsMagick share files
|
|
-MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+MagickShareSubdir="${PACKAGE_NAME}"
|
|
MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
|
|
MagickSharePathDefine="${MagickSharePath}/"
|
|
case "${build_os}" in
|