View | Details | Raw Unified | Return to bug 21629
Collapse All | Expand All

(-)BALL-1.3.0-orig/source/config/m4/fftw.m4 (-6 / +6 lines)
Lines 86-92 Link Here
86
		AC_MSG_CHECKING(linking against libfftw3f)
86
		AC_MSG_CHECKING(linking against libfftw3f)
87
		SAVE_LIBS=${LIBS}
87
		SAVE_LIBS=${LIBS}
88
		SAVE_LDFLAGS=${LDFLAGS}
88
		SAVE_LDFLAGS=${LDFLAGS}
89
		LIBS="${FFTW_LIB_F}/libfftw3f.a ${LIBS}"
89
		LIBS="-lfftw3f ${LIBS}"
90
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
90
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
91
		FFTW_LINKING_OK=0
91
		FFTW_LINKING_OK=0
92
		AC_TRY_LINK([
92
		AC_TRY_LINK([
Lines 114-120 Link Here
114
		AC_MSG_CHECKING(linking against libfftw3)
114
		AC_MSG_CHECKING(linking against libfftw3)
115
		SAVE_LIBS=${LIBS}
115
		SAVE_LIBS=${LIBS}
116
		SAVE_LDFLAGS=${LDFLAGS}
116
		SAVE_LDFLAGS=${LDFLAGS}
117
		LIBS="${FFTW_LIB_D}/libfftw3.a ${LIBS}"
117
		LIBS="-lfftw3 ${LIBS}"
118
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
118
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
119
		FFTW_LINKING_OK=0
119
		FFTW_LINKING_OK=0
120
		AC_TRY_LINK([
120
		AC_TRY_LINK([
Lines 142-148 Link Here
142
		AC_MSG_CHECKING(linking against libfftw3l)
142
		AC_MSG_CHECKING(linking against libfftw3l)
143
		SAVE_LIBS=${LIBS}
143
		SAVE_LIBS=${LIBS}
144
		SAVE_LDFLAGS=${LDFLAGS}
144
		SAVE_LDFLAGS=${LDFLAGS}
145
		LIBS="${FFTW_LIB_D}/libfftw3l.a ${LIBS}"
145
		LIBS="-lfftw3l ${LIBS}"
146
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
146
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
147
		FFTW_LINKING_OK=0
147
		FFTW_LINKING_OK=0
148
		AC_TRY_LINK([
148
		AC_TRY_LINK([
Lines 167-181 Link Here
167
167
168
	AC_DEFINE_UNQUOTED(PROJECT[]_COMPLEX_TYPE, ${PROJECT[]_COMPLEX_TYPE})
168
	AC_DEFINE_UNQUOTED(PROJECT[]_COMPLEX_TYPE, ${PROJECT[]_COMPLEX_TYPE})
169
	if test "${PROJECT[]_HAS_FFTW_FLOAT}" != "" ; then
169
	if test "${PROJECT[]_HAS_FFTW_FLOAT}" != "" ; then
170
		FFTW_LIBS="${FFTW_LIB_F}/libfftw3f.a"
170
		FFTW_LIBS="-lfftw3f"
171
		AC_DEFINE(PROJECT[]_HAS_FFTW_FLOAT,)
171
		AC_DEFINE(PROJECT[]_HAS_FFTW_FLOAT,)
172
	fi
172
	fi
173
	if test "${PROJECT[]_HAS_FFTW_DOUBLE}" != "" ; then
173
	if test "${PROJECT[]_HAS_FFTW_DOUBLE}" != "" ; then
174
		FFTW_LIBS="$FFTW_LIBS ${FFTW_LIB_D}/libfftw3.a"
174
		FFTW_LIBS="$FFTW_LIBS -lfftw3"
175
		AC_DEFINE(PROJECT[]_HAS_FFTW_DOUBLE,)
175
		AC_DEFINE(PROJECT[]_HAS_FFTW_DOUBLE,)
176
	fi
176
	fi
177
	if test "${PROJECT[]_HAS_FFTW_LONG_DOUBLE}" != "" ; then
177
	if test "${PROJECT[]_HAS_FFTW_LONG_DOUBLE}" != "" ; then
178
		FFTW_LIBS="$FFTW_LIBS ${FFTW_LIB_L}/libfftw3l.a"
178
		FFTW_LIBS="$FFTW_LIBS -lfftw3l"
179
		AC_DEFINE(PROJECT[]_HAS_FFTW_LONG_DOUBLE,)
179
		AC_DEFINE(PROJECT[]_HAS_FFTW_LONG_DOUBLE,)
180
	fi
180
	fi
181
		if test "${PROJECT[]_HAS_FFTW_H}" != "" ; then
181
		if test "${PROJECT[]_HAS_FFTW_H}" != "" ; then
(-)BALL-1.3.0-orig/source/config/m4/gsl.m4 (-2 / +2 lines)
Lines 64-71 Link Here
64
	else
64
	else
65
		AC_MSG_CHECKING(for libgslcblas)
65
		AC_MSG_CHECKING(for libgslcblas)
66
		if test "${GSL_LIBDIR}" != "" ; then
66
		if test "${GSL_LIBDIR}" != "" ; then
67
			if test -a "${GSL_LIBDIR}/libgslcblas.a" ; then
67
			if test -a "${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX}" ; then
68
				AC_MSG_RESULT(${GSL_LIBDIR}/libgslcblas.a)
68
				AC_MSG_RESULT(${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX})
69
			else
69
			else
70
				AC_MSG_RESULT((not found!))
70
				AC_MSG_RESULT((not found!))
71
				AC_MSG_RESULT()
71
				AC_MSG_RESULT()
(-)BALL-1.3.0-orig/source/configure (-10 / +10 lines)
Lines 19103-19109 Link Here
19103
$as_echo_n "checking linking against libfftw3f... " >&6; }
19103
$as_echo_n "checking linking against libfftw3f... " >&6; }
19104
		SAVE_LIBS=${LIBS}
19104
		SAVE_LIBS=${LIBS}
19105
		SAVE_LDFLAGS=${LDFLAGS}
19105
		SAVE_LDFLAGS=${LDFLAGS}
19106
		LIBS="${FFTW_LIB_F}/libfftw3f.a ${LIBS}"
19106
		LIBS="-lfftw3f ${LIBS}"
19107
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
19107
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
19108
		FFTW_LINKING_OK=0
19108
		FFTW_LINKING_OK=0
19109
		cat >conftest.$ac_ext <<_ACEOF
19109
		cat >conftest.$ac_ext <<_ACEOF
Lines 19217-19223 Link Here
19217
$as_echo_n "checking linking against libfftw3... " >&6; }
19217
$as_echo_n "checking linking against libfftw3... " >&6; }
19218
		SAVE_LIBS=${LIBS}
19218
		SAVE_LIBS=${LIBS}
19219
		SAVE_LDFLAGS=${LDFLAGS}
19219
		SAVE_LDFLAGS=${LDFLAGS}
19220
		LIBS="${FFTW_LIB_D}/libfftw3.a ${LIBS}"
19220
		LIBS="-lfftw3 ${LIBS}"
19221
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
19221
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
19222
		FFTW_LINKING_OK=0
19222
		FFTW_LINKING_OK=0
19223
		cat >conftest.$ac_ext <<_ACEOF
19223
		cat >conftest.$ac_ext <<_ACEOF
Lines 19331-19337 Link Here
19331
$as_echo_n "checking linking against libfftw3l... " >&6; }
19331
$as_echo_n "checking linking against libfftw3l... " >&6; }
19332
		SAVE_LIBS=${LIBS}
19332
		SAVE_LIBS=${LIBS}
19333
		SAVE_LDFLAGS=${LDFLAGS}
19333
		SAVE_LDFLAGS=${LDFLAGS}
19334
		LIBS="${FFTW_LIB_D}/libfftw3l.a ${LIBS}"
19334
		LIBS="-lfftw3l ${LIBS}"
19335
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
19335
		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
19336
		FFTW_LINKING_OK=0
19336
		FFTW_LINKING_OK=0
19337
		cat >conftest.$ac_ext <<_ACEOF
19337
		cat >conftest.$ac_ext <<_ACEOF
Lines 19444-19464 Link Here
19444
_ACEOF
19444
_ACEOF
19445
19445
19446
	if test "${BALL_HAS_FFTW_FLOAT}" != "" ; then
19446
	if test "${BALL_HAS_FFTW_FLOAT}" != "" ; then
19447
		FFTW_LIBS="${FFTW_LIB_F}/libfftw3f.a"
19447
		FFTW_LIBS="-lfftw3f"
19448
		cat >>confdefs.h <<\_ACEOF
19448
		cat >>confdefs.h <<\_ACEOF
19449
#define BALL_HAS_FFTW_FLOAT /**/
19449
#define BALL_HAS_FFTW_FLOAT /**/
19450
_ACEOF
19450
_ACEOF
19451
19451
19452
	fi
19452
	fi
19453
	if test "${BALL_HAS_FFTW_DOUBLE}" != "" ; then
19453
	if test "${BALL_HAS_FFTW_DOUBLE}" != "" ; then
19454
		FFTW_LIBS="$FFTW_LIBS ${FFTW_LIB_D}/libfftw3.a"
19454
		FFTW_LIBS="$FFTW_LIBS -lfftw3"
19455
		cat >>confdefs.h <<\_ACEOF
19455
		cat >>confdefs.h <<\_ACEOF
19456
#define BALL_HAS_FFTW_DOUBLE /**/
19456
#define BALL_HAS_FFTW_DOUBLE /**/
19457
_ACEOF
19457
_ACEOF
19458
19458
19459
	fi
19459
	fi
19460
	if test "${BALL_HAS_FFTW_LONG_DOUBLE}" != "" ; then
19460
	if test "${BALL_HAS_FFTW_LONG_DOUBLE}" != "" ; then
19461
		FFTW_LIBS="$FFTW_LIBS ${FFTW_LIB_L}/libfftw3l.a"
19461
		FFTW_LIBS="$FFTW_LIBS -lfftw3l"
19462
		cat >>confdefs.h <<\_ACEOF
19462
		cat >>confdefs.h <<\_ACEOF
19463
#define BALL_HAS_FFTW_LONG_DOUBLE /**/
19463
#define BALL_HAS_FFTW_LONG_DOUBLE /**/
19464
_ACEOF
19464
_ACEOF
Lines 19964-19972 Link Here
19964
		{ $as_echo "$as_me:$LINENO: checking for libgslcblas" >&5
19964
		{ $as_echo "$as_me:$LINENO: checking for libgslcblas" >&5
19965
$as_echo_n "checking for libgslcblas... " >&6; }
19965
$as_echo_n "checking for libgslcblas... " >&6; }
19966
		if test "${GSL_LIBDIR}" != "" ; then
19966
		if test "${GSL_LIBDIR}" != "" ; then
19967
			if test -a "${GSL_LIBDIR}/libgslcblas.a" ; then
19967
			if test -a "${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX}" ; then
19968
				{ $as_echo "$as_me:$LINENO: result: ${GSL_LIBDIR}/libgslcblas.a" >&5
19968
				{ $as_echo "$as_me:$LINENO: result: ${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX}" >&5
19969
$as_echo "${GSL_LIBDIR}/libgslcblas.a" >&6; }
19969
$as_echo "${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX}" >&6; }
19970
			else
19970
			else
19971
				{ $as_echo "$as_me:$LINENO: result: (not found!)" >&5
19971
				{ $as_echo "$as_me:$LINENO: result: (not found!)" >&5
19972
$as_echo "(not found!)" >&6; }
19972
$as_echo "(not found!)" >&6; }
Lines 39338-39344 Link Here
39338
39338
39339
if test "${USE_LIBTOOL}" = "true" ; then
39339
if test "${USE_LIBTOOL}" = "true" ; then
39340
	LINKER="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR}"
39340
	LINKER="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR}"
39341
	DYNAR="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR} --shared -export-dynamic -release ${BALL_VERSION_STRING} -rpath ${LIBTOOL_RPATH}/${LIBDIR}"
39341
	DYNAR="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR} --shared -export-dynamic -release ${BALL_VERSION_STRING}"
39342
	SHARED_LIB_SUFFIX=la
39342
	SHARED_LIB_SUFFIX=la
39343
39343
39344
else
39344
else
(-)BALL-1.3.0-orig/source/configure.ac (-1 / +1 lines)
Lines 835-841 Link Here
835
dnl
835
dnl
836
if test "${USE_LIBTOOL}" = "true" ; then
836
if test "${USE_LIBTOOL}" = "true" ; then
837
	LINKER="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR}"
837
	LINKER="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR}"
838
	DYNAR="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR} --shared -export-dynamic -release ${BALL_VERSION_STRING} -rpath ${LIBTOOL_RPATH}/${LIBDIR}"
838
	DYNAR="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR} --shared -export-dynamic -release ${BALL_VERSION_STRING}"
839
	SHARED_LIB_SUFFIX=la
839
	SHARED_LIB_SUFFIX=la
840
	AC_SUBST(SHARED_LIB_SUFFIX)
840
	AC_SUBST(SHARED_LIB_SUFFIX)
841
else
841
else

Return to bug 21629