1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
|
--- amide-1.0.0.orig/configure.in
+++ amide-1.0.0/configure.in
@@ -69,7 +69,7 @@ if test $CC = "gcc"; then
read continue_with_bad_gcc
if test $continue_with_bad_gcc = "y"; then
echo "removing optimizations to reduce potential of compiler error"
- CFLAGS="-g -O0"
+ CFLAGS="-O0"
else
exit 1
fi
@@ -92,8 +92,8 @@ fi
dnl check for various libraries and programs that we might need
AM_PATH_GSL(1.1.1, FOUND_LIBGSL=yes, FOUND_LIBGSL=no)
-AC_CHECK_LIB(ecat, matrix_open, FOUND_LIBECAT=yes, FOUND_LIBECAT=no, -L/sw/lib)
-AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm -L/sw/lib -L/usr/local/lib)
+AC_CHECK_LIB(ecat, matrix_open, FOUND_LIBECAT=yes, FOUND_LIBECAT=no)
+AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm)
AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDCON=no)
@@ -101,8 +101,8 @@ AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=ye
dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
-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="-ldcmdata -lofstd -loflog -lavcodec -lavutil -lz $THREAD_LIBS"
+AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
dnl 2010.02.20 AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include/dcmtk/dcmdata -I/usr/local/dicom/include/dcmtk/ofstd -I/usr/local/dicom/include -I/usr/include/dcmtk/dcmdata -I/usr/local/include/dcmtk/ofstd -I/sw/include/dcmtk/dcmdata -I/sw/include/dcmtk/ofstd -I/sw/include/dcmtk"
saved_ldflags="${LDFLAGS}"
saved_cxxflags="${CXXFLAGS}"
@@ -249,7 +249,7 @@ if (test $enable_libmdc = yes) && (test
AC_DEFINE(AMIDE_LIBMDC_SUPPORT, 1, Define to compile with (X)MedCon)
dnl 2007.10.28 - new xmedcon's should be using glib2/gtk2, dont' have to overwrite XMEDCON_LIBS
- dnl XMEDCON_LIBS="-L/usr/local/lib -L/usr/local/xmedcon/lib -lmdc"
+ dnl XMEDCON_LIBS="-lmdc"
AC_SUBST(XMEDCON_LIBS)
else
echo "compiling without xmedcon/libmdc file support"
@@ -455,6 +455,3 @@ AC_OUTPUT
dnl help/C/Makefile
dnl help/es/Makefile
-dnl Move the spec file so it won't get eaten by make distclean
-echo "Moving SPEC file to base directory"
-mv etc/amide.spec ./
--- amide-1.0.0.orig/Makefile.am
+++ amide-1.0.0/Makefile.am
@@ -1,5 +1,4 @@
ACLOCAL_AMFLAGS = \
- -I /usr/local/share/aclocal \
-I m4
if DISABLE_DOC
--- amide-1.0.0.orig/src/Makefile.am
+++ amide-1.0.0/src/Makefile.am
@@ -23,12 +23,11 @@ AM_CFLAGS = \
$(GSL_CFLAGS) \
$(LIBFAME_CFLAGS) \
$(AMIDE_GTK_CFLAGS) \
- $(AMIDE_DEBUG_CFLAGS) \
$(AMIDE_CHECK_OBSOLETE_CFLAGS) \
$(AMIDE_LIBDCMDATA_CFLAGS) \
- -I/usr/local/include \
$(XMEDCON_CFLAGS) \
- $(FFMPEG_CFLAGS)
+ $(LIBAVCODEC_CFLAGS) \
+ -DG_DISABLE_DEPRECATED
@@ -41,12 +40,11 @@ bin_PROGRAMS = amide
# to be behind the DCMTK stuff
amide_LDADD = \
$(GSL_LIBS) \
- $(LIBFAME_LIBS) \
$(AMIDE_LIBECAT_LIBS) \
$(AMIDE_LIBVOLPACK_LIBS) \
$(AMIDE_GTK_LIBS) \
$(XMEDCON_LIBS) \
- $(FFMPEG_LIBS) \
+ $(LIBAVCODEC_LIBS) \
$(AMIDE_LIBDCMDATA_LIBS) \
$(AMIDE_LDADD_WIN32)
--- amide-1.0.0.orig/etc/amide.desktop.in
+++ amide-1.0.0/etc/amide.desktop.in
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
_GenericName=Medical Image Examiner
_Name=Amide
_Comment=A Medical Image Data Examiner
|