API tools faq
paste
Advertisement
ReillyBrogan

Untitled

ReillyBrogan
Mar 12th, 2025
44
0
135 days
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 41.47 KB | None | 0 0
raw download clone embed print report
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Reilly Brogan <[email protected]>
  3. Date: Wed, 12 Mar 2025 15:02:20 -0500
  4. Subject: [PATCH] External cblas support
  5.  
  6. ---
  7. Makefile.am | 8 +-
  8. ax_cblas.m4 | 69 ++++
  9. bspline/Makefile.am | 2 +-
  10. configure.ac | 10 +
  11. configure.ac.orig | 657 ++++++++++++++++++++++++++++++++++++++
  12. eigen/Makefile.am | 2 +-
  13. gsl-config.in | 4 +-
  14. gsl.pc.in | 2 +-
  15. interpolation/Makefile.am | 2 +-
  16. linalg/Makefile.am | 2 +-
  17. multifit/Makefile.am | 4 +-
  18. multimin/Makefile.am | 4 +-
  19. multiroots/Makefile.am | 2 +-
  20. ode-initval/Makefile.am | 2 +-
  21. poly/Makefile.am | 2 +-
  22. specfunc/Makefile.am | 2 +-
  23. specfunc/Makefile.am.orig | 19 ++
  24. wavelet/Makefile.am | 2 +-
  25. 18 files changed, 776 insertions(+), 19 deletions(-)
  26. create mode 100644 ax_cblas.m4
  27. create mode 100644 configure.ac.orig
  28. mode change 100755 => 100644 gsl-config.in
  29. create mode 100644 specfunc/Makefile.am.orig
  30.  
  31. diff --git a/Makefile.am b/Makefile.am
  32. index 661e4430..c14bbd93 100644
  33. --- a/Makefile.am
  34. +++ b/Makefile.am
  35. @@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
  36.  
  37. lib_LTLIBRARIES = libgsl.la
  38. libgsl_la_SOURCES = version.c
  39. -libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
  40. +libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
  41. libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
  42. noinst_HEADERS = templates_on.h templates_off.h build.h
  43.  
  44. @@ -29,10 +29,10 @@ m4data_DATA = gsl.m4
  45. bin_PROGRAMS = gsl-randist gsl-histogram
  46.  
  47. gsl_randist_SOURCES = gsl-randist.c
  48. -gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
  49. +gsl_randist_LDADD = libgsl.la
  50.  
  51. gsl_histogram_SOURCES = gsl-histogram.c
  52. -gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
  53. +gsl_histogram_LDADD = libgsl.la
  54.  
  55. check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
  56. TESTS = test_gsl_histogram.sh pkgconfig.test
  57. @@ -51,6 +51,8 @@ edit = $(SED) \
  58. -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
  59. -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
  60. -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
  61. + -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
  62. + -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
  63. -e 's|@LIBS[@]|$(LIBS)|g' \
  64. -e 's|@VERSION[@]|$(VERSION)|g'
  65.  
  66. diff --git a/ax_cblas.m4 b/ax_cblas.m4
  67. new file mode 100644
  68. index 00000000..6ef143ac
  69. --- /dev/null
  70. +++ b/ax_cblas.m4
  71. @@ -0,0 +1,69 @@
  72. +AC_DEFUN([AX_CBLAS],[
  73. +
  74. + ext_cblas=no
  75. + ext_cblas_libs="-lcblas"
  76. + ext_cblas_cflags=""
  77. +
  78. + AC_ARG_WITH(cblas-external,
  79. + [AS_HELP_STRING([--with-cblas-external],
  80. + [Use external CBLAS library (default is no)])],
  81. + [with_ext_cblas=$withval],
  82. + [with_ext_cblas=no])
  83. +
  84. + case $with_ext_cblas in
  85. + no) ext_cblas=no ;;
  86. + yes) ext_cblas=yes ;;
  87. + -* | */* | *.a | *.so | *.so.* | *.o)
  88. + ext_cblas=yes
  89. + ext_cblas_libs="$with_cblas" ;;
  90. + *) ext_cblas=yes
  91. + ext_cblas_libs="-l$with_cblas" ;;
  92. + esac
  93. +
  94. + AC_ARG_WITH(cblas-external-libs,
  95. + [AS_HELP_STRING([--with-cblas-external-libs=<libs>],
  96. + [External cblas libraries to link with (default is "$ext_cblas_libs")])],
  97. + [ext_cblas_libs=$withval],
  98. + [])
  99. +
  100. + AC_ARG_WITH(cblas-external-cflags,
  101. + [AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
  102. + [Pre-processing flags to compile with external cblas ("-I<dir>")])],
  103. + [ext_cblas_cflags=$withval],
  104. + [])
  105. +
  106. + if test x$ext_cblas != xno; then
  107. + if test "x$CBLAS_LIBS" = x; then
  108. + CBLAS_LIBS="$ext_cblas_libs"
  109. + fi
  110. + if test "x$CBLAS_CFLAGS" = x; then
  111. + CBLAS_CFLAGS="$ext_cblas_cflags"
  112. + fi
  113. +
  114. + CFLAGS_sav="$CFLAGS"
  115. + CFLAGS="$CFLAGS $CBLAS_CFLAGS"
  116. + AC_CHECK_HEADER(cblas.h, ,
  117. + [AC_MSG_ERROR([
  118. + *** Header file cblas.h not found.
  119. + *** If you installed cblas header in a non standard place,
  120. + *** specify its install prefix using the following option
  121. + *** --with-cblas-external-cflags="-I<include_dir>"])
  122. + ])
  123. + CFLAGS="$CFLAGS_sav"
  124. +
  125. + LIBS_sav="$LIBS"
  126. + LIBS="$LIBS $CBLAS_LIBS -lm"
  127. + AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
  128. + AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
  129. + [AC_MSG_ERROR([
  130. + *** Linking with cblas with $LIBS failed.
  131. + *** If you installed cblas library in a non standard place,
  132. + *** specify its install prefix using the following option
  133. + *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
  134. + ])
  135. + AC_MSG_RESULT($ext_cblas)
  136. + LIBS="$LIBS_sav"
  137. + AC_SUBST([CBLAS_CFLAGS])
  138. + AC_SUBST([CBLAS_LIBS])
  139. + fi
  140. +])
  141. diff --git a/bspline/Makefile.am b/bspline/Makefile.am
  142. index 9e080cd5..d39f7add 100644
  143. --- a/bspline/Makefile.am
  144. +++ b/bspline/Makefile.am
  145. @@ -12,6 +12,6 @@ check_PROGRAMS = test
  146.  
  147. TESTS = $(check_PROGRAMS)
  148.  
  149. -test_LDADD = libgslbspline.la ../multifit/libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la ../poly/libgslpoly.la ../integration/libgslintegration.la ../rng/libgslrng.la ../sort/libgslsort.la
  150. +test_LDADD = libgslbspline.la ../multifit/libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la ../poly/libgslpoly.la ../integration/libgslintegration.la ../rng/libgslrng.la ../sort/libgslsort.la
  151.  
  152. test_SOURCES = test.c
  153. diff --git a/configure.ac b/configure.ac
  154. index 08622907..468bd4cc 100644
  155. --- a/configure.ac
  156. +++ b/configure.ac
  157. @@ -220,6 +220,16 @@ if test "x$LIBS" = "x" ; then
  158. AC_CHECK_LIB(m, cos)
  159. fi
  160.  
  161. +sinclude(ax_cblas.m4)
  162. +AX_CBLAS
  163. +if test "x$CBLAS_LIBS" != "x"; then
  164. + CBLAS_LINK_LIBS="$CBLAS_LIBS"
  165. +else
  166. + CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
  167. + CBLAS_LIBS="-lgslcblas"
  168. +fi
  169. +AC_SUBST(CBLAS_LINK_LIBS)
  170. +
  171. dnl Remember to put a definition in acconfig.h for each of these
  172. AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
  173. #include <fenv.h>])
  174. diff --git a/configure.ac.orig b/configure.ac.orig
  175. new file mode 100644
  176. index 00000000..38f93a23
  177. --- /dev/null
  178. +++ b/configure.ac.orig
  179. @@ -0,0 +1,657 @@
  180. +dnl Process this file with autoconf to produce a configure script.
  181. +
  182. +AC_INIT([gsl],[2.7])
  183. +AC_CONFIG_SRCDIR(gsl_math.h)
  184. +
  185. +AM_INIT_AUTOMAKE([gnu])
  186. +AC_CONFIG_HEADERS([config.h])
  187. +AM_MAINTAINER_MODE
  188. +
  189. +dnl Library versioning (C:R:A == current:revision:age)
  190. +dnl See the libtool manual for an explanation of the numbers
  191. +dnl
  192. +dnl gsl-1.0 libgsl 0:0:0 libgslcblas 0:0:0
  193. +dnl gsl-1.1 libgsl 1:0:1 libgslcblas 0:0:0
  194. +dnl gsl-1.1.1 libgsl 2:0:2 libgslcblas 0:0:0
  195. +dnl gsl-1.2 libgsl 3:0:3 libgslcblas 0:0:0
  196. +dnl gsl-1.3 libgsl 4:0:4 libgslcblas 0:0:0
  197. +dnl gsl-1.4 libgsl 5:0:5 libgslcblas 0:0:0
  198. +dnl gsl-1.5 libgsl 6:0:6 libgslcblas 0:0:0
  199. +dnl gsl-1.6 libgsl 7:0:7 libgslcblas 0:0:0
  200. +dnl gsl-1.7 libgsl 8:0:8 libgslcblas 0:0:0
  201. +dnl gsl-1.8 libgsl 9:0:9 libgslcblas 0:0:0
  202. +dnl gsl-1.9 libgsl 10:0:10 libgslcblas 0:0:0
  203. +dnl gsl-1.10 libgsl 10:0:10 (*) libgslcblas 0:0:0
  204. +dnl gsl-1.11 libgsl 12:0:12 libgslcblas 0:0:0
  205. +dnl gsl-1.12 libgsl 13:0:13 libgslcblas 0:0:0
  206. +dnl gsl-1.13 libgsl 14:0:14 libgslcblas 0:0:0
  207. +dnl gsl-1.14 libgsl 15:0:15 libgslcblas 0:0:0
  208. +dnl gsl-1.15 libgsl 16:0:16 libgslcblas 0:0:0
  209. +dnl gsl-1.16 libgsl 17:0:17 libgslcblas 0:0:0
  210. +dnl gsl-2.0 libgsl 18:0:18 (**) libgslcblas 0:0:0
  211. +dnl gsl-2.1 libgsl 19:0:0 libgslcblas 0:0:0
  212. +dnl gsl-2.2 libgsl 20:0:1 libgslcblas 0:0:0
  213. +dnl gsl-2.2.1 libgsl 21:0:2 libgslcblas 0:0:0
  214. +dnl gsl-2.3 libgsl 22:0:3 libgslcblas 0:0:0
  215. +dnl gsl-2.4 libgsl 23:0:0 libgslcblas 0:0:0
  216. +dnl gsl-2.5 libgsl 24:0:1 libgslcblas 0:0:0
  217. +dnl gsl-2.6 libgsl 25:0:0 libgslcblas 0:0:0
  218. +dnl gsl-2.7 libgsl 26:0:1 libgslcblas 0:0:0
  219. +dnl
  220. +dnl (*) There was an error on this release. Firstly, the versioning
  221. +dnl numbers were not updated. Secondly, 2 functions were removed, but
  222. +dnl the age not reset--this should have been 11:0:0. However these
  223. +dnl functions were not documented and are regarded as internal, so we
  224. +dnl will assume 11:0:11.
  225. +dnl
  226. +dnl (**) There was an error on this release. Age should have been
  227. +dnl reset to 18:0:0
  228. +dnl
  229. +dnl How to update library version number
  230. +dnl ====================================
  231. +dnl
  232. +dnl C: increment if the interface has additions, changes, removals.
  233. +dnl
  234. +dnl R: increment any time the source changes; set to 0 if you
  235. +dnl incremented CURRENT
  236. +dnl
  237. +dnl A: increment if any interfaces have been added; set to 0 if any
  238. +dnl interfaces have been removed. removal has precedence over adding,
  239. +dnl so set to 0 if both happened.
  240. +dnl
  241. +dnl See https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
  242. +dnl for more detailed info
  243. +
  244. +dnl
  245. +GSL_CURRENT=26
  246. +GSL_REVISION=0
  247. +GSL_AGE=1
  248. +dnl
  249. +CBLAS_CURRENT=0
  250. +CBLAS_REVISION=0
  251. +CBLAS_AGE=0
  252. +
  253. +GSL_LT_VERSION="${GSL_CURRENT}:${GSL_REVISION}:${GSL_AGE}"
  254. +AC_SUBST(GSL_LT_VERSION)
  255. +
  256. +GSL_LT_CBLAS_VERSION="${CBLAS_CURRENT}:${CBLAS_REVISION}:${CBLAS_AGE}"
  257. +AC_SUBST(GSL_LT_CBLAS_VERSION)
  258. +
  259. +case "$VERSION" in
  260. + *+)
  261. + ;;
  262. + *)
  263. + AC_DEFINE(RELEASED,[],[Defined if this is an official release])
  264. + ;;
  265. +esac
  266. +
  267. +dnl Split VERSION into GSL_VERSION_MAJOR and GSL_VERSION_MINOR
  268. +dnl Follows AX_SPLIT_VERSION macro from AC-Archive
  269. +dnl Rhys Ulerich <[email protected]>
  270. +AC_PROG_SED
  271. +GSL_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
  272. +GSL_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
  273. +AC_SUBST(GSL_MAJOR_VERSION)
  274. +AC_SUBST(GSL_MINOR_VERSION)
  275. +
  276. +AC_PROG_MKDIR_P
  277. +
  278. +dnl things required by automake
  279. +dnl AC_ARG_PROGRAM
  280. +AC_PROG_MAKE_SET
  281. +
  282. +dnl Check for which system.
  283. +AC_CANONICAL_HOST
  284. +
  285. +dnl Checks for programs.
  286. +AC_LANG(C)
  287. +AC_PROG_CC
  288. +AC_PROG_CPP
  289. +AC_PROG_INSTALL
  290. +AC_PROG_LN_S
  291. +LT_INIT([win32-dll])
  292. +
  293. +dnl Check compiler features
  294. +AC_TYPE_SIZE_T
  295. +dnl AC_C_CONST
  296. +AC_C_VOLATILE
  297. +AC_C_INLINE
  298. +AC_C_CHAR_UNSIGNED
  299. +
  300. +GSL_CFLAGS="-I$includedir"
  301. +GSL_LIBS="-L$libdir -lgsl"
  302. +dnl macro from libtool - can be replaced with LT_LIB_M when we require libtool 2
  303. +LT_LIB_M
  304. +GSL_LIBM=$LIBM
  305. +
  306. +AC_SUBST(GSL_CFLAGS)
  307. +AC_SUBST(GSL_LIBS)
  308. +AC_SUBST(GSL_LIBM)
  309. +
  310. +if test "$ac_cv_c_inline" != no ; then
  311. +dnl Check for "extern inline", using a modified version of the test
  312. +dnl for AC_C_INLINE from acspecific.mt
  313. +dnl
  314. + AC_CACHE_CHECK([for GNU-style extern inline], ac_cv_c_extern_inline,
  315. + [ac_cv_c_extern_inline=no
  316. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern $ac_cv_c_inline double foo(double x);
  317. + extern $ac_cv_c_inline double foo(double x) { return x + 1.0 ; } ;
  318. + double foo (double x) { return x + 1.0 ; };]], [[ foo(1.0) ]])],[ac_cv_c_extern_inline="yes"],[])
  319. + ])
  320. +
  321. + if test "$ac_cv_c_extern_inline" != no ; then
  322. + AC_DEFINE(HAVE_INLINE,[1],[Define if you have inline])
  323. + else
  324. + AC_CACHE_CHECK([for C99-style inline], ac_cv_c_c99inline,
  325. + [ac_cv_c_c99inline=no
  326. + dnl next line is a necessary condition
  327. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern inline void* foo() { foo(); return &foo ; };]],
  328. + [[ return foo() != 0 ]])],[ac_cv_c_c99inline="yes"],[])
  329. + dnl but not sufficient, extern must work but inline on its own should not
  330. + if test "$ac_cv_c_c99inline" != no ; then
  331. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[inline void* foo() { foo(); return &foo ; };]],
  332. + [[ return foo() != 0 ]])],[],ac_cv_c_c99inline="no")
  333. + fi
  334. + ])
  335. + if test "$ac_cv_c_c99inline" != no ; then
  336. + AC_DEFINE(HAVE_INLINE,[1],[Define if you have inline])
  337. + AC_DEFINE(HAVE_C99_INLINE,[1],[Define if you have inline with C99 behavior])
  338. + fi
  339. + fi
  340. +fi
  341. +
  342. +dnl Checks for header files.
  343. +AC_CHECK_HEADERS(ieeefp.h)
  344. +AC_CHECK_HEADERS(complex.h)
  345. +
  346. +dnl Checks for typedefs, structures, and compiler characteristics.
  347. +
  348. +case $host in
  349. + *-*-cygwin* | *-*-mingw* )
  350. + if test "$enable_shared" = yes; then
  351. + GSLCBLAS_LDFLAGS="$GSLCBLAS_LDFLAGS -no-undefined"
  352. + GSL_LDFLAGS="$GSL_LDFLAGS -no-undefined"
  353. + GSL_LIBADD="cblas/libgslcblas.la"
  354. + fi
  355. + ;;
  356. +esac
  357. +
  358. +AC_SUBST(GSLCBLAS_LDFLAGS)
  359. +AC_SUBST(GSL_LDFLAGS)
  360. +AC_SUBST(GSL_LIBADD)
  361. +
  362. +dnl Checks for library functions.
  363. +
  364. +dnl AC_FUNC_ALLOCA
  365. +AC_FUNC_VPRINTF
  366. +
  367. +dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added.
  368. +dnl removed strerror from this list, it's hardcoded in the err/ directory
  369. +dnl Any functions which appear in this list of functions should be provided
  370. +dnl in the utils/ directory
  371. +dnl xmalloc is not used, removed (bjg)
  372. +AC_REPLACE_FUNCS(memcpy memmove strdup strtol strtoul)
  373. +
  374. +AC_CACHE_CHECK(for EXIT_SUCCESS and EXIT_FAILURE,
  375. +ac_cv_decl_exit_success_and_failure,
  376. +AC_EGREP_CPP(yes,
  377. +[
  378. +#include <stdlib.h>
  379. +#ifdef EXIT_SUCCESS
  380. +yes
  381. +#endif
  382. +],
  383. +ac_cv_decl_exit_success_and_failure=yes,
  384. +ac_cv_decl_exit_success_and_failure=no)
  385. +)
  386. +
  387. +if test "$ac_cv_decl_exit_success_and_failure" = yes ; then
  388. + AC_DEFINE(HAVE_EXIT_SUCCESS_AND_FAILURE,1,[Defined if you have ansi EXIT_SUCCESS and EXIT_FAILURE in stdlib.h])
  389. +fi ;
  390. +
  391. +dnl Use alternate libm if specified by user
  392. +
  393. +if test "x$LIBS" = "x" ; then
  394. + AC_CHECK_LIB(m, cos)
  395. +fi
  396. +
  397. +dnl Remember to put a definition in acconfig.h for each of these
  398. +AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
  399. +#include <fenv.h>])
  400. +AC_CHECK_DECLS(fesettrapenable,,,[#define _GNU_SOURCE 1
  401. +#include <fenv.h>])
  402. +AC_CHECK_DECLS(hypot,,,[#include <math.h>])
  403. +AC_CHECK_DECLS(expm1,,,[#include <math.h>])
  404. +AC_CHECK_DECLS(acosh,,,[#include <math.h>])
  405. +AC_CHECK_DECLS(asinh,,,[#include <math.h>])
  406. +AC_CHECK_DECLS(atanh,,,[#include <math.h>])
  407. +AC_CHECK_DECLS(ldexp,,,[#include <math.h>])
  408. +AC_CHECK_DECLS(frexp,,,[#include <math.h>])
  409. +AC_CHECK_DECLS([fprnd_t],[],[],[[#include <float.h>]])
  410. +AC_CHECK_DECLS(isinf,,,[#include <math.h>])
  411. +AC_CHECK_DECLS(isfinite,,,[#include <math.h>])
  412. +AC_CHECK_DECLS(finite,,,[#include <math.h>
  413. +#if HAVE_IEEEFP_H
  414. +#include <ieeefp.h>
  415. +#endif])
  416. +AC_CHECK_DECLS(isnan,,,[#include <math.h>])
  417. +
  418. +dnl OpenBSD has a broken implementation of log1p.
  419. +case "$host" in
  420. + *-*-*openbsd*)
  421. + AC_MSG_RESULT([avoiding OpenBSD system log1p - using gsl version])
  422. + ;;
  423. + *)
  424. + AC_CHECK_DECLS(log1p,,,[#include <math.h>])
  425. + ;;
  426. +esac
  427. +
  428. +AC_CACHE_CHECK([for long double stdio], ac_cv_func_printf_longdouble,
  429. +[AC_RUN_IFELSE([AC_LANG_SOURCE([[
  430. +#include <stdlib.h>
  431. +#include <stdio.h>
  432. +int main (void)
  433. +{
  434. +const char * s = "5678.25"; long double x = 1.234 ;
  435. +fprintf(stderr,"%Lg\n",x) ;
  436. +sscanf(s, "%Lg", &x);
  437. +if (x == 5678.25) {exit (0);} else {exit(1); };
  438. +}]])],[ac_cv_func_printf_longdouble="yes"],[ac_cv_func_printf_longdouble="no"],[ac_cv_func_printf_longdouble="no"])])
  439. +
  440. +if test "$ac_cv_func_printf_longdouble" != no; then
  441. + AC_DEFINE(HAVE_PRINTF_LONGDOUBLE,1,[Define this if printf can handle %Lf for long double])
  442. +fi
  443. +
  444. +AC_CACHE_CHECK([for extended floating point registers],ac_cv_c_extended_fp,
  445. +[case "$host" in
  446. + *sparc*-*-*)
  447. + ac_cv_c_extended_fp=no
  448. + ;;
  449. + *powerpc*-*-*)
  450. + ac_cv_c_extended_fp=no
  451. + ;;
  452. + *hppa*-*-*)
  453. + ac_cv_c_extended_fp=no
  454. + ;;
  455. + *alpha*-*-*)
  456. + ac_cv_c_extended_fp=no
  457. + ;;
  458. + *68k*-*-*)
  459. + ac_cv_c_extended_fp=yes
  460. + ;;
  461. + *86-*-*)
  462. + ac_cv_c_extended_fp=yes
  463. + ;;
  464. + x86_64-*-*)
  465. + ac_cv_c_extended_fp=yes
  466. + ;;
  467. + *)
  468. + ac_cv_c_extended_fp=unknown
  469. + ;;
  470. +esac
  471. +])
  472. +
  473. +if test $ac_cv_c_extended_fp != "no" ; then
  474. + AC_DEFINE(HAVE_EXTENDED_PRECISION_REGISTERS,1,[Defined on architectures with excess floating-point precision])
  475. +fi
  476. +
  477. +AC_CACHE_CHECK([for IEEE arithmetic interface type], ac_cv_c_ieee_interface,
  478. +[case "$host" in
  479. + sparc-*-linux*)
  480. + ac_cv_c_ieee_interface=gnusparc
  481. + ;;
  482. + m68k-*-linux*)
  483. + ac_cv_c_ieee_interface=gnum68k
  484. + ;;
  485. + powerpc-*-linux*)
  486. + ac_cv_c_ieee_interface=gnuppc
  487. + ;;
  488. + *86-*-gnu | *86_64-*-gnu | *86-*-linux* | *86_64-*-linux*)
  489. + ac_cv_c_ieee_interface=gnux86
  490. + ;;
  491. + *-*-sunos4*)
  492. + ac_cv_c_ieee_interface=sunos4
  493. + ;;
  494. + *-*-solaris*)
  495. + ac_cv_c_ieee_interface=solaris
  496. + ;;
  497. + *-*-hpux11*)
  498. + ac_cv_c_ieee_interface=hpux11
  499. + ;;
  500. + *-*-hpux*)
  501. + ac_cv_c_ieee_interface=hpux
  502. + ;;
  503. + *-*-osf*)
  504. + ac_cv_c_ieee_interface=tru64
  505. + ;;
  506. + *-*-aix*)
  507. + ac_cv_c_ieee_interface=aix
  508. + ;;
  509. + *-*-irix*)
  510. + ac_cv_c_ieee_interface=irix
  511. + ;;
  512. + powerpc-*-*darwin*)
  513. + ac_cv_c_ieee_interface=darwin
  514. + ;;
  515. + *86-*-*darwin*)
  516. + ac_cv_c_ieee_interface=darwin86
  517. + ;;
  518. + *-*-*netbsd*)
  519. + ac_cv_c_ieee_interface=netbsd
  520. + ;;
  521. + *-*-*openbsd*)
  522. + ac_cv_c_ieee_interface=openbsd
  523. + ;;
  524. + *-*-*bsd*)
  525. + ac_cv_c_ieee_interface=freebsd
  526. + ;;
  527. + *-*-os2*)
  528. + ac_cv_c_ieee_interface=os2emx
  529. + ;;
  530. + *)
  531. + ac_cv_c_ieee_interface=unknown
  532. + ;;
  533. +esac
  534. +])
  535. +
  536. +if test "$ac_cv_c_ieee_interface" = "gnux86" ; then
  537. + AC_CACHE_CHECK([for FPU_SETCW], ac_cv_c_fpu_setcw,
  538. + [ac_cv_c_fpu_setcw=no
  539. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fpu_control.h>
  540. +#ifndef _FPU_SETCW
  541. +#include <i386/fpu_control.h>
  542. +#define _FPU_SETCW(cw) __setfpucw(cw)
  543. +#endif
  544. +]], [[ unsigned short mode = 0 ; _FPU_SETCW(mode); ]])],[ac_cv_c_fpu_setcw="yes"],[ac_cv_c_ieee_interface=unknown])
  545. + ])
  546. +fi
  547. +
  548. +if test "$ac_cv_c_ieee_interface" = "gnux86" ; then
  549. + AC_CACHE_CHECK([for SSE extensions], ac_cv_c_fpu_sse,
  550. + [ac_cv_c_fpu_sse=no
  551. + AC_RUN_IFELSE([AC_LANG_PROGRAM([[
  552. +#include <stdlib.h>
  553. +#define _FPU_SETMXCSR(cw_sse) asm volatile ("ldmxcsr %0" : : "m" (*&cw_sse))
  554. +]], [[ unsigned int mode = 0x1f80 ; _FPU_SETMXCSR(mode); exit(0); ]])],[ac_cv_c_fpu_sse="yes"],[ac_cv_c_fpu_sse="no"],[
  555. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  556. +#include <stdlib.h>
  557. +#define _FPU_SETMXCSR(cw_sse) asm volatile ("ldmxcsr %0" : : "m" (*&cw_sse))
  558. +]], [[ unsigned int mode = 0x1f80 ; _FPU_SETMXCSR(mode); exit(0); ]])],[ac_cv_c_fpu_sse="yes"],[ac_cv_c_fpu_sse="no"])
  559. +])])
  560. +
  561. + if test $ac_cv_c_fpu_sse = yes; then
  562. + AC_DEFINE([HAVE_FPU_X86_SSE], 1,
  563. + [Define if x86 processor has sse extensions.])
  564. + fi
  565. +fi
  566. +
  567. +ac_tr_ieee_interface=HAVE_`echo $ac_cv_c_ieee_interface | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_IEEE_INTERFACE
  568. +AC_DEFINE_UNQUOTED($ac_tr_ieee_interface,1,[IEEE Interface Type])
  569. +
  570. +AC_SUBST(HAVE_GNUSPARC_IEEE_INTERFACE)
  571. +AC_SUBST(HAVE_GNUM68K_IEEE_INTERFACE)
  572. +AC_SUBST(HAVE_GNUPPC_IEEE_INTERFACE)
  573. +AC_SUBST(HAVE_GNUX86_IEEE_INTERFACE)
  574. +AC_SUBST(HAVE_SUNOS4_IEEE_INTERFACE)
  575. +AC_SUBST(HAVE_SOLARIS_IEEE_INTERFACE)
  576. +AC_SUBST(HAVE_HPUX11_IEEE_INTERFACE)
  577. +AC_SUBST(HAVE_HPUX_IEEE_INTERFACE)
  578. +AC_SUBST(HAVE_TRU64_IEEE_INTERFACE)
  579. +AC_SUBST(HAVE_IRIX_IEEE_INTERFACE)
  580. +AC_SUBST(HAVE_AIX_IEEE_INTERFACE)
  581. +AC_SUBST(HAVE_FREEBSD_IEEE_INTERFACE)
  582. +AC_SUBST(HAVE_OS2EMX_IEEE_INTERFACE)
  583. +AC_SUBST(HAVE_NETBSD_IEEE_INTERFACE)
  584. +AC_SUBST(HAVE_OPENBSD_IEEE_INTERFACE)
  585. +AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
  586. +AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)
  587. +
  588. +dnl Check for IEEE control flags
  589. +
  590. +save_cflags="$CFLAGS"
  591. +AC_CACHE_CHECK([for IEEE compiler flags], ac_cv_c_ieee_flags,
  592. +[
  593. +case "$host" in
  594. + alpha*-*-*)
  595. + if test X"$GCC" = Xyes ; then
  596. + ieee_flags='-mieee -mfp-rounding-mode=d'
  597. + else
  598. + # This assumes Compaq's C compiler.
  599. + ieee_flags='-ieee -fprm d'
  600. + fi
  601. + ;;
  602. +esac
  603. +if test X"$ieee_flags" != X ; then
  604. + CFLAGS="$ieee_flags $CFLAGS"
  605. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int foo;]])],[ac_cv_c_ieee_flags="$ieee_flags"],[ac_cv_c_ieee_flags="none"])
  606. +else
  607. + ac_cv_c_ieee_flags="none"
  608. +fi])
  609. +
  610. +if test "$ac_cv_c_ieee_flags" != "none" ; then
  611. + CFLAGS="$ac_cv_c_ieee_flags $save_cflags"
  612. +else
  613. + CFLAGS="$save_cflags"
  614. +fi
  615. +
  616. +dnl Check IEEE comparisons, whether "x != x" is true for NaNs
  617. +dnl
  618. +AC_CACHE_CHECK([for IEEE comparisons], ac_cv_c_ieee_comparisons,
  619. +[AC_RUN_IFELSE([AC_LANG_SOURCE([[
  620. +#include <math.h>
  621. +int main (void)
  622. +{
  623. + int status; double inf, nan;
  624. + inf = exp(1.0e10);
  625. + nan = inf / inf ;
  626. + status = (nan == nan);
  627. + exit (status);
  628. +}]])],[ac_cv_c_ieee_comparisons="yes"],[ac_cv_c_ieee_comparisons="no"],[ac_cv_c_ieee_comparisons="yes"])
  629. +])
  630. +
  631. +if test "$ac_cv_c_ieee_comparisons" != no ; then
  632. + AC_DEFINE(HAVE_IEEE_COMPARISONS,1,[Define this if IEEE comparisons work correctly (e.g. NaN != NaN)])
  633. +fi
  634. +
  635. +dnl Check for IEEE denormalized arithmetic
  636. +dnl
  637. +AC_CACHE_CHECK([for IEEE denormalized values], ac_cv_c_ieee_denormals,
  638. +[AC_RUN_IFELSE([AC_LANG_SOURCE([[
  639. +#include <math.h>
  640. +int main (void)
  641. +{
  642. + int i, status;
  643. + volatile double z = 1e-308;
  644. + for (i = 0; i < 5; i++) { z = z / 10.0 ; };
  645. + for (i = 0; i < 5; i++) { z = z * 10.0 ; };
  646. + status = (z == 0.0);
  647. + exit (status);
  648. +}]])],[ac_cv_c_ieee_denormals="yes"],[ac_cv_c_ieee_denormals="no"],[ac_cv_c_ieee_denormals="yes"])
  649. +])
  650. +
  651. +if test "$ac_cv_c_ieee_denormals" != no ; then
  652. + AC_DEFINE(HAVE_IEEE_DENORMALS,1,[Define this if IEEE denormalized numbers are available])
  653. +fi
  654. +
  655. +AH_TEMPLATE([HIDE_INLINE_STATIC],[Define if you need to hide the static definitions of inline functions])
  656. +
  657. +AH_BOTTOM([/* Use 0 and 1 for EXIT_SUCCESS and EXIT_FAILURE if we don't have them */
  658. +#if !HAVE_EXIT_SUCCESS_AND_FAILURE
  659. +#define EXIT_SUCCESS 0
  660. +#define EXIT_FAILURE 1
  661. +#endif])
  662. +
  663. +AH_BOTTOM([/* Define one of these if you have a known IEEE arithmetic interface */
  664. +#undef HAVE_GNUSPARC_IEEE_INTERFACE
  665. +#undef HAVE_GNUM68K_IEEE_INTERFACE
  666. +#undef HAVE_GNUPPC_IEEE_INTERFACE
  667. +#undef HAVE_GNUX86_IEEE_INTERFACE
  668. +#undef HAVE_SUNOS4_IEEE_INTERFACE
  669. +#undef HAVE_SOLARIS_IEEE_INTERFACE
  670. +#undef HAVE_HPUX11_IEEE_INTERFACE
  671. +#undef HAVE_HPUX_IEEE_INTERFACE
  672. +#undef HAVE_TRU64_IEEE_INTERFACE
  673. +#undef HAVE_IRIX_IEEE_INTERFACE
  674. +#undef HAVE_AIX_IEEE_INTERFACE
  675. +#undef HAVE_FREEBSD_IEEE_INTERFACE
  676. +#undef HAVE_OS2EMX_IEEE_INTERFACE
  677. +#undef HAVE_NETBSD_IEEE_INTERFACE
  678. +#undef HAVE_OPENBSD_IEEE_INTERFACE
  679. +#undef HAVE_DARWIN_IEEE_INTERFACE
  680. +#undef HAVE_DARWIN86_IEEE_INTERFACE])
  681. +
  682. +AH_BOTTOM([/* Define a rounding function which moves extended precision values
  683. + out of registers and rounds them to double-precision. This should
  684. + be used *sparingly*, in places where it is necessary to keep
  685. + double-precision rounding for critical expressions while running in
  686. + extended precision. For example, the following code should ensure
  687. + exact equality, even when extended precision registers are in use,
  688. +
  689. + double q = GSL_COERCE_DBL(3.0/7.0) ;
  690. + if (q == GSL_COERCE_DBL(3.0/7.0)) { ... } ;
  691. +
  692. + It carries a penalty even when the program is running in double
  693. + precision mode unless you compile a separate version of the
  694. + library with HAVE_EXTENDED_PRECISION_REGISTERS turned off. */
  695. +
  696. +#if HAVE_EXTENDED_PRECISION_REGISTERS
  697. +#define GSL_COERCE_DBL(x) (gsl_coerce_double(x))
  698. +#else
  699. +#define GSL_COERCE_DBL(x) (x)
  700. +#endif])
  701. +
  702. +AH_BOTTOM([/* Substitute gsl functions for missing system functions */
  703. +
  704. +#if !HAVE_DECL_HYPOT
  705. +#define hypot gsl_hypot
  706. +#endif
  707. +
  708. +#if !HAVE_DECL_LOG1P
  709. +#define log1p gsl_log1p
  710. +#endif
  711. +
  712. +#if !HAVE_DECL_EXPM1
  713. +#define expm1 gsl_expm1
  714. +#endif
  715. +
  716. +#if !HAVE_DECL_ACOSH
  717. +#define acosh gsl_acosh
  718. +#endif
  719. +
  720. +#if !HAVE_DECL_ASINH
  721. +#define asinh gsl_asinh
  722. +#endif
  723. +
  724. +#if !HAVE_DECL_ATANH
  725. +#define atanh gsl_atanh
  726. +#endif
  727. +
  728. +#if !HAVE_DECL_LDEXP
  729. +#define ldexp gsl_ldexp
  730. +#endif
  731. +
  732. +#if !HAVE_DECL_FREXP
  733. +#define frexp gsl_frexp
  734. +#endif
  735. +
  736. +#if !HAVE_DECL_ISINF
  737. +#define isinf gsl_isinf
  738. +#endif
  739. +
  740. +#if !HAVE_DECL_ISFINITE
  741. +#define isfinite gsl_finite
  742. +#endif
  743. +
  744. +#if !HAVE_DECL_FINITE
  745. +#define finite gsl_finite
  746. +#endif
  747. +
  748. +#if !HAVE_DECL_ISNAN
  749. +#define isnan gsl_isnan
  750. +#endif])
  751. +
  752. +AH_BOTTOM([#ifdef __GNUC__
  753. +#define DISCARD_POINTER(p) do { ; } while(p ? 0 : 0);
  754. +#else
  755. +#define DISCARD_POINTER(p) /* ignoring discarded pointer */
  756. +#endif])
  757. +
  758. +AH_BOTTOM([#if defined(GSL_RANGE_CHECK_OFF) || !defined(GSL_RANGE_CHECK)
  759. +#define GSL_RANGE_CHECK 0 /* turn off range checking by default internally */
  760. +#endif])
  761. +
  762. +AH_BOTTOM([#define RETURN_IF_NULL(x) if (!x) { return ; }
  763. +])
  764. +
  765. +AH_VERBATIM([GSL_DISABLE_DEPRECATED],
  766. +[/* Disable deprecated functions and enums while building */
  767. +#undef GSL_DISABLE_DEPRECATED])
  768. +
  769. +dnl
  770. +AC_CONFIG_FILES([ \
  771. +Makefile \
  772. +gsl_version.h \
  773. +gsl.spec \
  774. +blas/Makefile \
  775. +block/Makefile \
  776. +bspline/Makefile \
  777. +bst/Makefile \
  778. +cblas/Makefile \
  779. +cdf/Makefile \
  780. +cheb/Makefile \
  781. +combination/Makefile \
  782. +complex/Makefile \
  783. +const/Makefile \
  784. +deriv/Makefile \
  785. +dht/Makefile \
  786. +diff/Makefile \
  787. +doc/Makefile \
  788. +doc/examples/Makefile \
  789. +eigen/Makefile \
  790. +err/Makefile \
  791. +fft/Makefile \
  792. +filter/Makefile \
  793. +fit/Makefile \
  794. +gsl/Makefile \
  795. +histogram/Makefile \
  796. +ieee-utils/Makefile \
  797. +integration/Makefile \
  798. +interpolation/Makefile \
  799. +linalg/Makefile \
  800. +matrix/Makefile \
  801. +min/Makefile \
  802. +monte/Makefile \
  803. +movstat/Makefile \
  804. +multifit/Makefile \
  805. +multifit_nlinear/Makefile \
  806. +multilarge/Makefile \
  807. +multilarge_nlinear/Makefile \
  808. +multimin/Makefile \
  809. +multiroots/Makefile \
  810. +multiset/Makefile \
  811. +ntuple/Makefile \
  812. +ode-initval/Makefile \
  813. +ode-initval2/Makefile \
  814. +permutation/Makefile \
  815. +poly/Makefile \
  816. +qrng/Makefile \
  817. +randist/Makefile \
  818. +rng/Makefile \
  819. +roots/Makefile \
  820. +rstat/Makefile \
  821. +siman/Makefile \
  822. +sort/Makefile \
  823. +spblas/Makefile \
  824. +splinalg/Makefile \
  825. +spmatrix/Makefile \
  826. +specfunc/Makefile \
  827. +statistics/Makefile \
  828. +sum/Makefile \
  829. +sys/Makefile \
  830. +test/Makefile \
  831. +utils/Makefile \
  832. +vector/Makefile \
  833. +wavelet/Makefile \
  834. +])
  835. +
  836. +AC_OUTPUT
  837. diff --git a/eigen/Makefile.am b/eigen/Makefile.am
  838. index d9bdce58..e3c19ebc 100644
  839. --- a/eigen/Makefile.am
  840. +++ b/eigen/Makefile.am
  841. @@ -11,7 +11,7 @@ noinst_HEADERS = recurse.h qrstep.c
  842.  
  843. TESTS = $(check_PROGRAMS)
  844.  
  845. -test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
  846. +test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
  847.  
  848. test_SOURCES = test.c
  849.  
  850. diff --git a/gsl-config.in b/gsl-config.in
  851. old mode 100755
  852. new mode 100644
  853. index 3f3fa616..c9c42627
  854. --- a/gsl-config.in
  855. +++ b/gsl-config.in
  856. @@ -58,11 +58,11 @@ while test $# -gt 0; do
  857. ;;
  858.  
  859. --cflags)
  860. - echo @GSL_CFLAGS@
  861. + echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
  862. ;;
  863.  
  864. --libs)
  865. - : ${GSL_CBLAS_LIB=-lgslcblas}
  866. + : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
  867. echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
  868. ;;
  869.  
  870. diff --git a/gsl.pc.in b/gsl.pc.in
  871. index 5e9ef218..5a7a0f3d 100644
  872. --- a/gsl.pc.in
  873. +++ b/gsl.pc.in
  874. @@ -2,7 +2,7 @@ prefix=@prefix@
  875. exec_prefix=@exec_prefix@
  876. libdir=@libdir@
  877. includedir=@includedir@
  878. -GSL_CBLAS_LIB=-lgslcblas
  879. +GSL_CBLAS_LIB=@CBLAS_LIBS@
  880.  
  881. Name: GSL
  882. Description: GNU Scientific Library
  883. diff --git a/interpolation/Makefile.am b/interpolation/Makefile.am
  884. index 1d807555..e45bd513 100644
  885. --- a/interpolation/Makefile.am
  886. +++ b/interpolation/Makefile.am
  887. @@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
  888.  
  889. TESTS = $(check_PROGRAMS)
  890.  
  891. -test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  892. +test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  893.  
  894. test_SOURCES = test.c
  895.  
  896. diff --git a/linalg/Makefile.am b/linalg/Makefile.am
  897. index 70bd07b1..b4f38f73 100644
  898. --- a/linalg/Makefile.am
  899. +++ b/linalg/Makefile.am
  900. @@ -13,4 +13,4 @@ TESTS = $(check_PROGRAMS)
  901. check_PROGRAMS = test
  902.  
  903. test_SOURCES = test.c
  904. -test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../rng/libgslrng.la
  905. +test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../rng/libgslrng.la
  906. diff --git a/multifit/Makefile.am b/multifit/Makefile.am
  907. index 988614e0..793b4856 100644
  908. --- a/multifit/Makefile.am
  909. +++ b/multifit/Makefile.am
  910. @@ -67,8 +67,8 @@ check_PROGRAMS = test #demo
  911. TESTS = $(check_PROGRAMS)
  912.  
  913. test_SOURCES = test.c
  914. -test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ../min/libgslmin.la
  915. +test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ../min/libgslmin.la
  916.  
  917. #demo_SOURCES = demo.c
  918. -#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
  919. +#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
  920.  
  921. diff --git a/multimin/Makefile.am b/multimin/Makefile.am
  922. index 7071359c..65a488a3 100644
  923. --- a/multimin/Makefile.am
  924. +++ b/multimin/Makefile.am
  925. @@ -13,8 +13,8 @@ check_PROGRAMS = test #demo
  926. TESTS = $(check_PROGRAMS)
  927.  
  928. test_SOURCES = test.c test_funcs.c test_funcs.h
  929. -test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  930. +test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  931.  
  932. #demo_SOURCES = demo.c
  933. -#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  934. +#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  935.  
  936. diff --git a/multiroots/Makefile.am b/multiroots/Makefile.am
  937. index a351c3f3..6178448f 100644
  938. --- a/multiroots/Makefile.am
  939. +++ b/multiroots/Makefile.am
  940. @@ -15,5 +15,5 @@ check_PROGRAMS = test
  941. TESTS = $(check_PROGRAMS)
  942.  
  943. test_SOURCES = test.c test_funcs.c test_funcs.h
  944. -test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  945. +test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  946.  
  947. diff --git a/ode-initval/Makefile.am b/ode-initval/Makefile.am
  948. index 9c774b5e..346c3816 100644
  949. --- a/ode-initval/Makefile.am
  950. +++ b/ode-initval/Makefile.am
  951. @@ -12,7 +12,7 @@ check_PROGRAMS = test
  952.  
  953. TESTS = $(check_PROGRAMS)
  954.  
  955. -test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  956. +test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  957.  
  958. test_SOURCES = test.c
  959.  
  960. diff --git a/poly/Makefile.am b/poly/Makefile.am
  961. index f1dae5d8..e0f8e83b 100644
  962. --- a/poly/Makefile.am
  963. +++ b/poly/Makefile.am
  964. @@ -10,7 +10,7 @@ noinst_HEADERS = balance.c companion.c qr.c
  965.  
  966. TESTS = $(check_PROGRAMS)
  967.  
  968. -check_PROGRAMS = test
  969. +#check_PROGRAMS = test
  970.  
  971. test_SOURCES = test.c
  972. test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
  973. diff --git a/specfunc/Makefile.am b/specfunc/Makefile.am
  974. index 3995577d..7a9e91dc 100644
  975. --- a/specfunc/Makefile.am
  976. +++ b/specfunc/Makefile.am
  977. @@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
  978.  
  979. check_PROGRAMS = test
  980.  
  981. -test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  982. +test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  983.  
  984. test_SOURCES = test_sf.c test_sf.h test_airy.c test_alf.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hermite.c test_hyperg.c test_legendre.c test_mathieu.c test_sincos_pi.c
  985.  
  986. diff --git a/specfunc/Makefile.am.orig b/specfunc/Makefile.am.orig
  987. new file mode 100644
  988. index 00000000..c2bcdba1
  989. --- /dev/null
  990. +++ b/specfunc/Makefile.am.orig
  991. @@ -0,0 +1,19 @@
  992. +noinst_LTLIBRARIES = libgslspecfunc.la
  993. +
  994. +pkginclude_HEADERS = gsl_sf.h gsl_sf_airy.h gsl_sf_bessel.h gsl_sf_clausen.h gsl_sf_coulomb.h gsl_sf_coupling.h gsl_sf_dawson.h gsl_sf_debye.h gsl_sf_dilog.h gsl_sf_elementary.h gsl_sf_ellint.h gsl_sf_elljac.h gsl_sf_erf.h gsl_sf_exp.h gsl_sf_expint.h gsl_sf_fermi_dirac.h gsl_sf_gamma.h gsl_sf_gegenbauer.h gsl_sf_hermite.h gsl_sf_hyperg.h gsl_sf_laguerre.h gsl_sf_lambert.h gsl_sf_legendre.h gsl_sf_log.h gsl_sf_mathieu.h gsl_sf_pow_int.h gsl_sf_psi.h gsl_sf_result.h gsl_sf_sincos_pi.h gsl_sf_synchrotron.h gsl_sf_transport.h gsl_sf_trig.h gsl_sf_zeta.h gsl_specfunc.h
  995. +
  996. +noinst_HEADERS = bessel_amp_phase.h bessel_olver.h bessel_temme.h bessel.h hyperg.h legendre.h eval.h chebyshev.h cheb_eval.c cheb_eval_mode.c check.h error.h legendre_source.c
  997. +
  998. +AM_CPPFLAGS = -I$(top_srcdir)
  999. +
  1000. +libgslspecfunc_la_SOURCES = airy.c airy_der.c airy_zero.c atanint.c bessel.c bessel.h bessel_I0.c bessel_I1.c bessel_In.c bessel_Inu.c bessel_J0.c bessel_J1.c bessel_Jn.c bessel_Jnu.c bessel_K0.c bessel_K1.c bessel_Kn.c bessel_Knu.c bessel_Y0.c bessel_Y1.c bessel_Yn.c bessel_Ynu.c bessel_amp_phase.c bessel_amp_phase.h bessel_i.c bessel_j.c bessel_k.c bessel_olver.c bessel_temme.c bessel_y.c bessel_zero.c bessel_sequence.c beta.c beta_inc.c clausen.c coulomb.c coupling.c coulomb_bound.c dawson.c debye.c dilog.c elementary.c ellint.c elljac.c erfc.c exp.c expint.c expint3.c fermi_dirac.c gegenbauer.c gamma.c gamma_inc.c hermite.c hyperg_0F1.c hyperg_2F0.c hyperg_1F1.c hyperg_2F1.c hyperg_U.c hyperg.c inline.c laguerre.c lambert.c legendre_H3d.c legendre_P.c legendre_Qn.c legendre_con.c legendre_poly.c log.c mathieu_angfunc.c mathieu_charv.c mathieu_coeff.c mathieu_radfunc.c mathieu_workspace.c poch.c pow_int.c psi.c recurse.h result.c shint.c sincos_pi.c sinint.c synchrotron.c transport.c trig.c zeta.c
  1001. +
  1002. +TESTS = $(check_PROGRAMS)
  1003. +
  1004. +check_PROGRAMS = test
  1005. +
  1006. +test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  1007. +
  1008. +test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hermite.c test_hyperg.c test_legendre.c test_mathieu.c test_sincos_pi.c
  1009. +
  1010. +
  1011. diff --git a/wavelet/Makefile.am b/wavelet/Makefile.am
  1012. index 3f279f77..4b06055a 100644
  1013. --- a/wavelet/Makefile.am
  1014. +++ b/wavelet/Makefile.am
  1015. @@ -10,7 +10,7 @@ check_PROGRAMS = test
  1016.  
  1017. TESTS = $(check_PROGRAMS)
  1018.  
  1019. -test_LDADD = libgslwavelet.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  1020. +test_LDADD = libgslwavelet.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  1021.  
  1022. test_SOURCES = test.c
  1023.  
  1024.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!