mirror of
https://git.freebsd.org/ports.git
synced 2025-07-15 08:19:13 -04:00
06fc0912e4
Actual patch is a mix of work from subitter and my modifications based on debian patch from [1] While here, fix the DCMTK option. PR: 215240 Submitted by: jbeich Obtained From: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/amide/trunk/debian/patches/libav10.patch?view=markup&pathrev=16327 [1]
71 lines
1.9 KiB
Text
71 lines
1.9 KiB
Text
--- configure.orig 2014-01-27 03:04:34 UTC
|
|
+++ configure
|
|
@@ -16216,7 +16216,7 @@ if test "x$ac_cv_func_bind_textdomain_co
|
|
DATADIRNAME=share
|
|
else
|
|
CATOBJEXT=.mo
|
|
- DATADIRNAME=lib
|
|
+ DATADIRNAME=share
|
|
fi
|
|
|
|
;;
|
|
@@ -16226,7 +16226,7 @@ fi
|
|
;;
|
|
*)
|
|
CATOBJEXT=.mo
|
|
- DATADIRNAME=lib
|
|
+ DATADIRNAME=share
|
|
;;
|
|
esac
|
|
fi
|
|
@@ -16914,12 +16914,12 @@ else
|
|
if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
|
|
DATADIRNAME=share
|
|
else
|
|
- DATADIRNAME=lib
|
|
+ DATADIRNAME=share
|
|
fi
|
|
|
|
;;
|
|
*)
|
|
- DATADIRNAME=lib
|
|
+ DATADIRNAME=share
|
|
;;
|
|
esac
|
|
fi
|
|
@@ -17612,8 +17612,8 @@ else
|
|
THREAD_LIBS=""
|
|
fi
|
|
|
|
-AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
|
|
-AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include"
|
|
+AMIDE_LIBDCMDATA_LIBS="-L%%LOCALBASE%%/lib -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
|
|
+AMIDE_LIBDCMDATA_CFLAGS="-I%%LOCALBASE%%/include"
|
|
saved_libs="${LIBS}"
|
|
LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
|
|
saved_cxxflags="${CXXFLAGS}"
|
|
@@ -17643,6 +17643,8 @@ if ac_fn_cxx_try_link "$LINENO"; then :
|
|
else
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdcmdata was not found." >&5
|
|
$as_echo "$as_me: WARNING: libdcmdata was not found." >&2;}
|
|
+ AMIDE_LIBDCMDATA_LIBS=""
|
|
+ AMIDE_LIBDCMDATA_CFLAGS=""
|
|
fi
|
|
rm -f core conftest.err conftest.$ac_objext \
|
|
conftest$ac_exeext conftest.$ac_ext
|
|
@@ -18154,6 +18156,7 @@ $as_echo_n "checking for libfame - versi
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
ac_save_LIBS="$LIBS"
|
|
CFLAGS="$CFLAGS $LIBFAME_CFLAGS"
|
|
+ CXXFLAGS="$CFLAGS $LIBFAME_CFLAGS"
|
|
LIBS="$LIBFAME_LIBS $LIBS"
|
|
rm -f conf.libfametest
|
|
if test "$cross_compiling" = yes; then :
|
|
@@ -18165,6 +18168,7 @@ else
|
|
#include <fame.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#include <string.h>
|
|
|
|
int
|
|
main ()
|