Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 119355 | Differences between
and this patch

Collapse All | Expand All

(-)amide-0.9.1/configure.in (-14 / +11 lines)
Lines 42-50 Link Here
42
dnl =====================================================================
42
dnl =====================================================================
43
dnl pick our optimization level, OSX's version of gcc doesn't handle -O6
43
dnl pick our optimization level, OSX's version of gcc doesn't handle -O6
44
case "$host_os" in
44
case "$host_os" in
45
darwin*) 	CFLAGS="-g -O2 -Wall";;
45
darwin*) 	CFLAGS="-O2 -Wall";;
46
*)		CFLAGS="-g -O6 -Wall"
46
*)		CFLAGS="-O6 -Wall"
47
		CXXFLAGS="-g -O6 -Wall";;
47
		CXXFLAGS="-O6 -Wall";;
48
esac
48
esac
49
49
50
if test $CC = "gcc"; then
50
if test $CC = "gcc"; then
Lines 61-67 Link Here
61
	read continue_with_bad_gcc
61
	read continue_with_bad_gcc
62
	if test $continue_with_bad_gcc = "y"; then
62
	if test $continue_with_bad_gcc = "y"; then
63
		echo "removing optimizations to reduce potential of compiler error"
63
		echo "removing optimizations to reduce potential of compiler error"
64
		CFLAGS="-g -O0"
64
		CFLAGS="-O0"
65
	else
65
	else
66
		exit 1
66
		exit 1
67
	fi
67
	fi
Lines 84-99 Link Here
84
84
85
dnl check for various libraries and programs that we might need
85
dnl check for various libraries and programs that we might need
86
AM_PATH_GSL(1.1.1, FOUND_LIBGSL=yes, FOUND_LIBGSL=no)
86
AM_PATH_GSL(1.1.1, FOUND_LIBGSL=yes, FOUND_LIBGSL=no)
87
AC_CHECK_LIB(ecat, matrix_open, FOUND_LIBECAT=yes, FOUND_LIBECAT=no, -L/sw/lib)
87
AC_CHECK_LIB(ecat, matrix_open, FOUND_LIBECAT=yes, FOUND_LIBECAT=no)
88
AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm -L/sw/lib -L/usr/local/lib)
88
AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm)
89
AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDCON=no)
89
AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDCON=no)
90
AM_PATH_LIBFAME(0.9.1, FOUND_LIBFAME=yes, FOUND_LIBFAME=no)
90
dnl AM_PATH_LIBFAME(0.9.1, FOUND_LIBFAME=yes, FOUND_LIBFAME=no)
91
dnl AC_CHECK_LIB(libfame, fame_init, FOUND_LIBFAME=yes, FOUND_LIBFAME=no)
91
dnl AC_CHECK_LIB(libfame, fame_init, FOUND_LIBFAME=yes, FOUND_LIBFAME=no)
92
92
93
dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
93
dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
94
AC_LANG_CPLUSPLUS
94
AC_LANG_CPLUSPLUS
95
AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
95
AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
96
AC_CHECK_LIB(dcmdata, main, FOUND_DCMDATA=yes, FOUND_DCMDATA=no, -lofstd  -lz -L/usr/local/dicom/lib -L/sw/lib $THREAD_LIBS)
96
AC_CHECK_LIB(dcmdata, main, FOUND_DCMDATA=yes, FOUND_DCMDATA=no, -lofstd  -lz $THREAD_LIBS)
97
97
98
98
99
dnl Let people compile without debugging information
99
dnl Let people compile without debugging information
Lines 171-177 Link Here
171
	AC_DEFINE(AMIDE_LIBMDC_SUPPORT, 1, Define to compile with (X)MedCon)
171
	AC_DEFINE(AMIDE_LIBMDC_SUPPORT, 1, Define to compile with (X)MedCon)
172
172
173
	dnl 2007.10.28 - new xmedcon's should be using glib2/gtk2, dont' have to overwrite XMEDCON_LIBS
173
	dnl 2007.10.28 - new xmedcon's should be using glib2/gtk2, dont' have to overwrite XMEDCON_LIBS
174
	dnl XMEDCON_LIBS="-L/usr/local/lib -L/usr/local/xmedcon/lib -lmdc"
174
	dnl XMEDCON_LIBS="-lmdc"
175
	AC_SUBST(XMEDCON_LIBS)
175
	AC_SUBST(XMEDCON_LIBS)
176
else
176
else
177
	echo "Compiling without xmedcon/libmdc file support"
177
	echo "Compiling without xmedcon/libmdc file support"
Lines 218-225 Link Here
218
218
219
if (test $enable_libdcmdata = yes) && (test $FOUND_DCMDATA = yes); then
219
if (test $enable_libdcmdata = yes) && (test $FOUND_DCMDATA = yes); then
220
	echo "Compiling with DCMTK support for DICOM files"
220
	echo "Compiling with DCMTK support for DICOM files"
221
	AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -ldcmdata -lofstd -lz $THREAD_LIBS"
221
	AMIDE_LIBDCMDATA_LIBS="-ldcmdata -lofstd -lz $THREAD_LIBS"
222
	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"
222
	AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
223
	AC_SUBST(AMIDE_LIBDCMDATA_LIBS)
223
	AC_SUBST(AMIDE_LIBDCMDATA_LIBS)
224
	AC_SUBST(AMIDE_LIBDCMDATA_CFLAGS)
224
	AC_SUBST(AMIDE_LIBDCMDATA_CFLAGS)
225
	AC_DEFINE(AMIDE_LIBDCMDATA_SUPPORT, 1, Define to compile with DCMTK)
225
	AC_DEFINE(AMIDE_LIBDCMDATA_SUPPORT, 1, Define to compile with DCMTK)
Lines 351-356 Link Here
351
dnl help/C/Makefile
351
dnl help/C/Makefile
352
dnl help/es/Makefile
352
dnl help/es/Makefile
353
353
354
dnl Move the spec file so it won't get eaten by make distclean
355
echo "Moving SPEC file to base directory"
356
mv etc/amide.spec ./
(-)amide-0.9.1/Makefile.am (-3 / +1 lines)
Lines 1-6 Link Here
1
ACLOCAL_AMFLAGS = \
1
ACLOCAL_AMFLAGS = -I m4
2
	-I /usr/local/share/aclocal \
3
	-I m4
4
2
5
if DISABLE_DOC
3
if DISABLE_DOC
6
HELPDIR = 
4
HELPDIR = 
(-)amide-0.9.1/src/Makefile.am (-4 / +2 lines)
Lines 23-35 Link Here
23
	$(GSL_CFLAGS) \
23
	$(GSL_CFLAGS) \
24
	$(LIBFAME_CFLAGS) \
24
	$(LIBFAME_CFLAGS) \
25
	$(AMIDE_GTK_CFLAGS) \
25
	$(AMIDE_GTK_CFLAGS) \
26
	$(AMIDE_DEBUG_CFLAGS) \
27
	$(AMIDE_LIBDCMDATA_CFLAGS) \
26
	$(AMIDE_LIBDCMDATA_CFLAGS) \
28
	-I/usr/local/include \
29
	$(XMEDCON_CFLAGS) \
27
	$(XMEDCON_CFLAGS) \
30
	-DG_DISABLE_DEPRECATED \
28
	-DG_DISABLE_DEPRECATED
31
	-DGTK_DISABLE_DEPRECATED 
32
29
30
##	-DGTK_DISABLE_DEPRECATED
33
##	-DGNOME_DISABLE_DEPRECATED 
31
##	-DGNOME_DISABLE_DEPRECATED 
34
32
35
33

Return to bug 119355