--- ./fft/c_pass.h Fri May 19 21:05:38 2000 +++ ../gsl-0.6/./fft/c_pass.h Fri Sep 8 11:50:29 2000 @@ -22,7 +22,7 @@ const size_t istride, BASE out[], const size_t ostride, - gsl_fft_direction sign, + const gsl_fft_direction sign, const size_t product, const size_t n, const gsl_complex twiddle[]); @@ -32,7 +32,7 @@ const size_t istride, BASE out[], const size_t ostride, - gsl_fft_direction sign, + const gsl_fft_direction sign, const size_t product, const size_t n, const gsl_complex twiddle1[], --- ./sys/hypot.c Thu May 4 07:25:09 2000 +++ ../gsl-0.6/./sys/hypot.c Fri Sep 8 15:33:41 2000 @@ -20,9 +20,9 @@ #include #include -inline double gsl_hypot (const double x, const double y); +double gsl_hypot (const double x, const double y); -inline double gsl_hypot (const double x, const double y) +double gsl_hypot (const double x, const double y) { double xabs = fabs(x) ; double yabs = fabs(y) ; --- ./qrng/niederreiter-2.c Fri May 5 18:36:12 2000 +++ ../gsl-0.6/./qrng/niederreiter-2.c Fri Sep 8 11:44:29 2000 @@ -216,7 +216,7 @@ static void calculate_cj(nied2_state_t * ns, unsigned int dimension) { - const int MAXV = NIED2_NBITS + NIED2_MAX_DEGREE; +#define MAXV (NIED2_NBITS + NIED2_MAX_DEGREE) int ci[NIED2_NBITS][NIED2_NBITS]; int v[MAXV+1]; @@ -288,6 +288,7 @@ } } +#undef MAXV } --- ./sort/gsl_sort_int.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_int.h Fri Sep 8 11:32:56 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_int (int * data, size_t stride, size_t n); -int gsl_sort_int_index (size_t * p, const int * data, size_t stride, size_t n); +void gsl_sort_int (int * data, const size_t stride, const size_t n); +int gsl_sort_int_index (size_t * p, const int * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_ushort.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_ushort.h Fri Sep 8 11:32:19 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_ushort (unsigned short * data, size_t stride, size_t n); -int gsl_sort_ushort_index (size_t * p, const unsigned short * data, size_t stride, size_t n); +void gsl_sort_ushort (unsigned short * data, const size_t stride, const size_t n); +int gsl_sort_ushort_index (size_t * p, const unsigned short * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_double.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_double.h Fri Sep 8 11:33:03 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort (double * data, size_t stride, size_t n); -int gsl_sort_index (size_t * p, const double * data, size_t stride, size_t n); +void gsl_sort (double * data, const size_t stride, const size_t n); +int gsl_sort_index (size_t * p, const double * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_long.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_long.h Fri Sep 8 11:32:53 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_long (long * data, size_t stride, size_t n); -int gsl_sort_long_index (size_t * p, const long * data, size_t stride, size_t n); +void gsl_sort_long (long * data, const size_t stride, const size_t n); +int gsl_sort_long_index (size_t * p, const long * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_uchar.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_uchar.h Fri Sep 8 11:32:42 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_uchar (unsigned char * data, size_t stride, size_t n); -int gsl_sort_uchar_index (size_t * p, const unsigned char * data, size_t stride, size_t n); +void gsl_sort_uchar (unsigned char * data, const size_t stride, const size_t n); +int gsl_sort_uchar_index (size_t * p, const unsigned char * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_char.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_char.h Fri Sep 8 11:33:14 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_char (char * data, size_t stride, size_t n); -int gsl_sort_char_index (size_t * p, const char * data, size_t stride, size_t n); +void gsl_sort_char (char * data, const size_t stride, const size_t n); +int gsl_sort_char_index (size_t * p, const char * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_ulong.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_ulong.h Fri Sep 8 11:32:22 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_ulong (unsigned long * data, size_t stride, size_t n); -int gsl_sort_ulong_index (size_t * p, const unsigned long * data, size_t stride, size_t n); +void gsl_sort_ulong (unsigned long * data, const size_t stride, const size_t n); +int gsl_sort_ulong_index (size_t * p, const unsigned long * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_float.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_float.h Fri Sep 8 11:32:59 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_float (float * data, size_t stride, size_t n); -int gsl_sort_float_index (size_t * p, const float * data, size_t stride, size_t n); +void gsl_sort_float (float * data, const size_t stride, const size_t n); +int gsl_sort_float_index (size_t * p, const float * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_short.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_short.h Fri Sep 8 11:32:46 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_short (short * data, size_t stride, size_t n); -int gsl_sort_short_index (size_t * p, const short * data, size_t stride, size_t n); +void gsl_sort_short (short * data, const size_t stride, const size_t n); +int gsl_sort_short_index (size_t * p, const short * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_uint.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_uint.h Fri Sep 8 11:32:33 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_uint (unsigned int * data, size_t stride, size_t n); -int gsl_sort_uint_index (size_t * p, const unsigned int * data, size_t stride, size_t n); +void gsl_sort_uint (unsigned int * data, const size_t stride, const size_t n); +int gsl_sort_uint_index (size_t * p, const unsigned int * data, const size_t stride, const size_t n); __END_DECLS --- ./sort/gsl_sort_long_double.h Thu May 4 07:25:06 2000 +++ ../gsl-0.6/./sort/gsl_sort_long_double.h Fri Sep 8 11:32:49 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -void gsl_sort_long_double (long double * data, size_t stride, size_t n); -int gsl_sort_long_double_index (size_t * p, const long double * data, size_t stride, size_t n); +void gsl_sort_long_double (long double * data, const size_t stride, const size_t n); +int gsl_sort_long_double_index (size_t * p, const long double * data, const size_t stride, const size_t n); __END_DECLS --- ./matrix/gsl_matrix_uint.h Fri May 19 21:05:54 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_uint.h Fri Sep 8 11:20:56 2000 @@ -83,7 +83,7 @@ unsigned int * gsl_matrix_uint_ptr(const gsl_matrix_uint * m, const size_t i, const size_t j); unsigned int gsl_matrix_uint_get(const gsl_matrix_uint * m, const size_t i, const size_t j); -void gsl_matrix_uint_set(gsl_matrix_uint * m, const size_t i, const size_t j, unsigned int x); +void gsl_matrix_uint_set(gsl_matrix_uint * m, const size_t i, const size_t j, const unsigned int x); int gsl_matrix_uint_fread (FILE * stream, gsl_matrix_uint * m) ; int gsl_matrix_uint_fwrite (FILE * stream, const gsl_matrix_uint * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_uint_transpose (gsl_matrix_uint * m); -gsl_matrix_uint gsl_matrix_uint_submatrix (gsl_matrix_uint * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_uint gsl_matrix_uint_row (gsl_matrix_uint * m, size_t i); -gsl_vector_uint gsl_matrix_uint_column (gsl_matrix_uint * m, size_t j); +gsl_matrix_uint gsl_matrix_uint_submatrix (gsl_matrix_uint * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_uint gsl_matrix_uint_row (gsl_matrix_uint * m, const size_t i); +gsl_vector_uint gsl_matrix_uint_column (gsl_matrix_uint * m, const size_t j); gsl_vector_uint gsl_matrix_uint_diagonal (gsl_matrix_uint * m); unsigned int gsl_matrix_uint_max (const gsl_matrix_uint * m); --- ./matrix/rowcol_source.c Fri May 19 21:05:56 2000 +++ ../gsl-0.6/./matrix/rowcol_source.c Fri Sep 8 11:19:57 2000 @@ -357,8 +357,10 @@ int FUNCTION(gsl_matrix, view_from_vector) (TYPE(gsl_matrix) * m, TYPE(gsl_vector) * base, - size_t offset, - size_t n1, size_t n2, size_t d2) + const size_t offset, + const size_t n1, + const size_t n2, + const size_t d2) { if (n1 == 0) { --- ./matrix/gsl_matrix_char.h Fri May 19 21:05:51 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_char.h Fri Sep 8 11:22:03 2000 @@ -83,7 +83,7 @@ char * gsl_matrix_char_ptr(const gsl_matrix_char * m, const size_t i, const size_t j); char gsl_matrix_char_get(const gsl_matrix_char * m, const size_t i, const size_t j); -void gsl_matrix_char_set(gsl_matrix_char * m, const size_t i, const size_t j, char x); +void gsl_matrix_char_set(gsl_matrix_char * m, const size_t i, const size_t j, const char x); int gsl_matrix_char_fread (FILE * stream, gsl_matrix_char * m) ; int gsl_matrix_char_fwrite (FILE * stream, const gsl_matrix_char * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_char_transpose (gsl_matrix_char * m); -gsl_matrix_char gsl_matrix_char_submatrix (gsl_matrix_char * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_char gsl_matrix_char_row (gsl_matrix_char * m, size_t i); -gsl_vector_char gsl_matrix_char_column (gsl_matrix_char * m, size_t j); +gsl_matrix_char gsl_matrix_char_submatrix (gsl_matrix_char * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_char gsl_matrix_char_row (gsl_matrix_char * m, const size_t i); +gsl_vector_char gsl_matrix_char_column (gsl_matrix_char * m, const size_t j); gsl_vector_char gsl_matrix_char_diagonal (gsl_matrix_char * m); char gsl_matrix_char_max (const gsl_matrix_char * m); --- ./matrix/gsl_matrix_uchar.h Fri May 19 21:05:54 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_uchar.h Fri Sep 8 11:21:00 2000 @@ -83,7 +83,7 @@ unsigned char * gsl_matrix_uchar_ptr(const gsl_matrix_uchar * m, const size_t i, const size_t j); unsigned char gsl_matrix_uchar_get(const gsl_matrix_uchar * m, const size_t i, const size_t j); -void gsl_matrix_uchar_set(gsl_matrix_uchar * m, const size_t i, const size_t j, unsigned char x); +void gsl_matrix_uchar_set(gsl_matrix_uchar * m, const size_t i, const size_t j, const unsigned char x); int gsl_matrix_uchar_fread (FILE * stream, gsl_matrix_uchar * m) ; int gsl_matrix_uchar_fwrite (FILE * stream, const gsl_matrix_uchar * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_uchar_transpose (gsl_matrix_uchar * m); -gsl_matrix_uchar gsl_matrix_uchar_submatrix (gsl_matrix_uchar * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_uchar gsl_matrix_uchar_row (gsl_matrix_uchar * m, size_t i); -gsl_vector_uchar gsl_matrix_uchar_column (gsl_matrix_uchar * m, size_t j); +gsl_matrix_uchar gsl_matrix_uchar_submatrix (gsl_matrix_uchar * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_uchar gsl_matrix_uchar_row (gsl_matrix_uchar * m, const size_t i); +gsl_vector_uchar gsl_matrix_uchar_column (gsl_matrix_uchar * m, const size_t j); gsl_vector_uchar gsl_matrix_uchar_diagonal (gsl_matrix_uchar * m); unsigned char gsl_matrix_uchar_max (const gsl_matrix_uchar * m); --- ./matrix/gsl_matrix_ushort.h Fri May 19 21:05:55 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_ushort.h Fri Sep 8 11:20:51 2000 @@ -83,7 +83,7 @@ unsigned short * gsl_matrix_ushort_ptr(const gsl_matrix_ushort * m, const size_t i, const size_t j); unsigned short gsl_matrix_ushort_get(const gsl_matrix_ushort * m, const size_t i, const size_t j); -void gsl_matrix_ushort_set(gsl_matrix_ushort * m, const size_t i, const size_t j, unsigned short x); +void gsl_matrix_ushort_set(gsl_matrix_ushort * m, const size_t i, const size_t j, const unsigned short x); int gsl_matrix_ushort_fread (FILE * stream, gsl_matrix_ushort * m) ; int gsl_matrix_ushort_fwrite (FILE * stream, const gsl_matrix_ushort * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_ushort_transpose (gsl_matrix_ushort * m); -gsl_matrix_ushort gsl_matrix_ushort_submatrix (gsl_matrix_ushort * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_ushort gsl_matrix_ushort_row (gsl_matrix_ushort * m, size_t i); -gsl_vector_ushort gsl_matrix_ushort_column (gsl_matrix_ushort * m, size_t j); +gsl_matrix_ushort gsl_matrix_ushort_submatrix (gsl_matrix_ushort * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_ushort gsl_matrix_ushort_row (gsl_matrix_ushort * m, const size_t i); +gsl_vector_ushort gsl_matrix_ushort_column (gsl_matrix_ushort * m, const size_t j); gsl_vector_ushort gsl_matrix_ushort_diagonal (gsl_matrix_ushort * m); unsigned short gsl_matrix_ushort_max (const gsl_matrix_ushort * m); --- ./matrix/gsl_matrix_ulong.h Fri May 19 21:05:54 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_ulong.h Fri Sep 8 11:20:41 2000 @@ -83,7 +83,7 @@ unsigned long * gsl_matrix_ulong_ptr(const gsl_matrix_ulong * m, const size_t i, const size_t j); unsigned long gsl_matrix_ulong_get(const gsl_matrix_ulong * m, const size_t i, const size_t j); -void gsl_matrix_ulong_set(gsl_matrix_ulong * m, const size_t i, const size_t j, unsigned long x); +void gsl_matrix_ulong_set(gsl_matrix_ulong * m, const size_t i, const size_t j, const unsigned long x); int gsl_matrix_ulong_fread (FILE * stream, gsl_matrix_ulong * m) ; int gsl_matrix_ulong_fwrite (FILE * stream, const gsl_matrix_ulong * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_ulong_transpose (gsl_matrix_ulong * m); -gsl_matrix_ulong gsl_matrix_ulong_submatrix (gsl_matrix_ulong * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_ulong gsl_matrix_ulong_row (gsl_matrix_ulong * m, size_t i); -gsl_vector_ulong gsl_matrix_ulong_column (gsl_matrix_ulong * m, size_t j); +gsl_matrix_ulong gsl_matrix_ulong_submatrix (gsl_matrix_ulong * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_ulong gsl_matrix_ulong_row (gsl_matrix_ulong * m, const size_t i); +gsl_vector_ulong gsl_matrix_ulong_column (gsl_matrix_ulong * m, const size_t j); gsl_vector_ulong gsl_matrix_ulong_diagonal (gsl_matrix_ulong * m); unsigned long gsl_matrix_ulong_max (const gsl_matrix_ulong * m); --- ./matrix/gsl_matrix_float.h Fri May 19 21:05:52 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_float.h Fri Sep 8 11:21:34 2000 @@ -83,7 +83,7 @@ float * gsl_matrix_float_ptr(const gsl_matrix_float * m, const size_t i, const size_t j); float gsl_matrix_float_get(const gsl_matrix_float * m, const size_t i, const size_t j); -void gsl_matrix_float_set(gsl_matrix_float * m, const size_t i, const size_t j, float x); +void gsl_matrix_float_set(gsl_matrix_float * m, const size_t i, const size_t j, const float x); int gsl_matrix_float_fread (FILE * stream, gsl_matrix_float * m) ; int gsl_matrix_float_fwrite (FILE * stream, const gsl_matrix_float * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_float_transpose (gsl_matrix_float * m); -gsl_matrix_float gsl_matrix_float_submatrix (gsl_matrix_float * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_float gsl_matrix_float_row (gsl_matrix_float * m, size_t i); -gsl_vector_float gsl_matrix_float_column (gsl_matrix_float * m, size_t j); +gsl_matrix_float gsl_matrix_float_submatrix (gsl_matrix_float * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_float gsl_matrix_float_row (gsl_matrix_float * m, const size_t i); +gsl_vector_float gsl_matrix_float_column (gsl_matrix_float * m, const size_t j); gsl_vector_float gsl_matrix_float_diagonal (gsl_matrix_float * m); float gsl_matrix_float_max (const gsl_matrix_float * m); --- ./matrix/gsl_matrix_short.h Fri May 19 21:05:53 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_short.h Fri Sep 8 11:21:05 2000 @@ -83,7 +83,7 @@ short * gsl_matrix_short_ptr(const gsl_matrix_short * m, const size_t i, const size_t j); short gsl_matrix_short_get(const gsl_matrix_short * m, const size_t i, const size_t j); -void gsl_matrix_short_set(gsl_matrix_short * m, const size_t i, const size_t j, short x); +void gsl_matrix_short_set(gsl_matrix_short * m, const size_t i, const size_t j, const short x); int gsl_matrix_short_fread (FILE * stream, gsl_matrix_short * m) ; int gsl_matrix_short_fwrite (FILE * stream, const gsl_matrix_short * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_short_transpose (gsl_matrix_short * m); -gsl_matrix_short gsl_matrix_short_submatrix (gsl_matrix_short * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_short gsl_matrix_short_row (gsl_matrix_short * m, size_t i); -gsl_vector_short gsl_matrix_short_column (gsl_matrix_short * m, size_t j); +gsl_matrix_short gsl_matrix_short_submatrix (gsl_matrix_short * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_short gsl_matrix_short_row (gsl_matrix_short * m, const size_t i); +gsl_vector_short gsl_matrix_short_column (gsl_matrix_short * m, const size_t j); gsl_vector_short gsl_matrix_short_diagonal (gsl_matrix_short * m); short gsl_matrix_short_max (const gsl_matrix_short * m); --- ./matrix/gsl_matrix_long.h Fri May 19 21:05:52 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_long.h Fri Sep 8 11:21:22 2000 @@ -83,7 +83,7 @@ long * gsl_matrix_long_ptr(const gsl_matrix_long * m, const size_t i, const size_t j); long gsl_matrix_long_get(const gsl_matrix_long * m, const size_t i, const size_t j); -void gsl_matrix_long_set(gsl_matrix_long * m, const size_t i, const size_t j, long x); +void gsl_matrix_long_set(gsl_matrix_long * m, const size_t i, const size_t j, const long x); int gsl_matrix_long_fread (FILE * stream, gsl_matrix_long * m) ; int gsl_matrix_long_fwrite (FILE * stream, const gsl_matrix_long * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_long_transpose (gsl_matrix_long * m); -gsl_matrix_long gsl_matrix_long_submatrix (gsl_matrix_long * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_long gsl_matrix_long_row (gsl_matrix_long * m, size_t i); -gsl_vector_long gsl_matrix_long_column (gsl_matrix_long * m, size_t j); +gsl_matrix_long gsl_matrix_long_submatrix (gsl_matrix_long * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_long gsl_matrix_long_row (gsl_matrix_long * m, const size_t i); +gsl_vector_long gsl_matrix_long_column (gsl_matrix_long * m, const size_t j); gsl_vector_long gsl_matrix_long_diagonal (gsl_matrix_long * m); long gsl_matrix_long_max (const gsl_matrix_long * m); --- ./matrix/matrix_source.c Fri May 19 21:05:55 2000 +++ ../gsl-0.6/./matrix/matrix_source.c Fri Sep 8 15:31:53 2000 @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -inline BASE +BASE FUNCTION (gsl_matrix, get) (const TYPE (gsl_matrix) * m, const size_t i, const size_t j) { @@ -37,7 +37,7 @@ return *(BASE *) (m->data + MULTIPLICITY * (i * m->tda + j)); } -inline void +void FUNCTION (gsl_matrix, set) (TYPE (gsl_matrix) * m, const size_t i, const size_t j, const BASE x) --- ./matrix/gsl_matrix_double.h Fri May 19 21:05:51 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_double.h Fri Sep 8 11:21:39 2000 @@ -83,7 +83,7 @@ double * gsl_matrix_ptr(const gsl_matrix * m, const size_t i, const size_t j); double gsl_matrix_get(const gsl_matrix * m, const size_t i, const size_t j); -void gsl_matrix_set(gsl_matrix * m, const size_t i, const size_t j, double x); +void gsl_matrix_set(gsl_matrix * m, const size_t i, const size_t j, const double x); int gsl_matrix_fread (FILE * stream, gsl_matrix * m) ; int gsl_matrix_fwrite (FILE * stream, const gsl_matrix * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_transpose (gsl_matrix * m); -gsl_matrix gsl_matrix_submatrix (gsl_matrix * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector gsl_matrix_row (gsl_matrix * m, size_t i); -gsl_vector gsl_matrix_column (gsl_matrix * m, size_t j); +gsl_matrix gsl_matrix_submatrix (gsl_matrix * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector gsl_matrix_row (gsl_matrix * m, const size_t i); +gsl_vector gsl_matrix_column (gsl_matrix * m, const size_t j); gsl_vector gsl_matrix_diagonal (gsl_matrix * m); double gsl_matrix_max (const gsl_matrix * m); --- ./matrix/gsl_matrix_int.h Fri May 19 21:05:52 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_int.h Fri Sep 8 11:21:28 2000 @@ -83,7 +83,7 @@ int * gsl_matrix_int_ptr(const gsl_matrix_int * m, const size_t i, const size_t j); int gsl_matrix_int_get(const gsl_matrix_int * m, const size_t i, const size_t j); -void gsl_matrix_int_set(gsl_matrix_int * m, const size_t i, const size_t j, int x); +void gsl_matrix_int_set(gsl_matrix_int * m, const size_t i, const size_t j, const int x); int gsl_matrix_int_fread (FILE * stream, gsl_matrix_int * m) ; int gsl_matrix_int_fwrite (FILE * stream, const gsl_matrix_int * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_int_transpose (gsl_matrix_int * m); -gsl_matrix_int gsl_matrix_int_submatrix (gsl_matrix_int * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_int gsl_matrix_int_row (gsl_matrix_int * m, size_t i); -gsl_vector_int gsl_matrix_int_column (gsl_matrix_int * m, size_t j); +gsl_matrix_int gsl_matrix_int_submatrix (gsl_matrix_int * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_int gsl_matrix_int_row (gsl_matrix_int * m, const size_t i); +gsl_vector_int gsl_matrix_int_column (gsl_matrix_int * m, const size_t j); gsl_vector_int gsl_matrix_int_diagonal (gsl_matrix_int * m); int gsl_matrix_int_max (const gsl_matrix_int * m); --- ./matrix/gsl_matrix_complex_float.h Fri May 19 21:05:51 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_complex_float.h Fri Sep 8 11:21:54 2000 @@ -98,9 +98,9 @@ int gsl_matrix_complex_float_transpose (gsl_matrix_complex_float * m); -gsl_matrix_complex_float gsl_matrix_complex_float_submatrix (gsl_matrix_complex_float * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_complex_float gsl_matrix_complex_float_row (gsl_matrix_complex_float * m, size_t i); -gsl_vector_complex_float gsl_matrix_complex_float_column (gsl_matrix_complex_float * m, size_t j); +gsl_matrix_complex_float gsl_matrix_complex_float_submatrix (gsl_matrix_complex_float * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_complex_float gsl_matrix_complex_float_row (gsl_matrix_complex_float * m, const size_t i); +gsl_vector_complex_float gsl_matrix_complex_float_column (gsl_matrix_complex_float * m, const size_t j); gsl_vector_complex_float gsl_matrix_complex_float_diagonal (gsl_matrix_complex_float * m); int gsl_matrix_complex_float_isnull (const gsl_matrix_complex_float * m); --- ./matrix/gsl_matrix_long_double.h Fri May 19 21:05:53 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_long_double.h Fri Sep 8 11:20:02 2000 @@ -83,7 +83,7 @@ long double * gsl_matrix_long_double_ptr(const gsl_matrix_long_double * m, const size_t i, const size_t j); long double gsl_matrix_long_double_get(const gsl_matrix_long_double * m, const size_t i, const size_t j); -void gsl_matrix_long_double_set(gsl_matrix_long_double * m, const size_t i, const size_t j, long double x); +void gsl_matrix_long_double_set(gsl_matrix_long_double * m, const size_t i, const size_t j, const long double x); int gsl_matrix_long_double_fread (FILE * stream, gsl_matrix_long_double * m) ; int gsl_matrix_long_double_fwrite (FILE * stream, const gsl_matrix_long_double * m) ; @@ -99,9 +99,9 @@ int gsl_matrix_long_double_transpose (gsl_matrix_long_double * m); -gsl_matrix_long_double gsl_matrix_long_double_submatrix (gsl_matrix_long_double * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_long_double gsl_matrix_long_double_row (gsl_matrix_long_double * m, size_t i); -gsl_vector_long_double gsl_matrix_long_double_column (gsl_matrix_long_double * m, size_t j); +gsl_matrix_long_double gsl_matrix_long_double_submatrix (gsl_matrix_long_double * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_long_double gsl_matrix_long_double_row (gsl_matrix_long_double * m, const size_t i); +gsl_vector_long_double gsl_matrix_long_double_column (gsl_matrix_long_double * m, const size_t j); gsl_vector_long_double gsl_matrix_long_double_diagonal (gsl_matrix_long_double * m); long double gsl_matrix_long_double_max (const gsl_matrix_long_double * m); --- ./matrix/gsl_matrix_complex_double.h Fri May 19 21:05:51 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_complex_double.h Fri Sep 8 11:21:59 2000 @@ -98,9 +98,9 @@ int gsl_matrix_complex_transpose (gsl_matrix_complex * m); -gsl_matrix_complex gsl_matrix_complex_submatrix (gsl_matrix_complex * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_complex gsl_matrix_complex_row (gsl_matrix_complex * m, size_t i); -gsl_vector_complex gsl_matrix_complex_column (gsl_matrix_complex * m, size_t j); +gsl_matrix_complex gsl_matrix_complex_submatrix (gsl_matrix_complex * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_complex gsl_matrix_complex_row (gsl_matrix_complex * m, const size_t i); +gsl_vector_complex gsl_matrix_complex_column (gsl_matrix_complex * m, const size_t j); gsl_vector_complex gsl_matrix_complex_diagonal (gsl_matrix_complex * m); int gsl_matrix_complex_isnull (const gsl_matrix_complex * m); --- ./matrix/gsl_matrix_complex_long_double.h Fri May 19 21:05:51 2000 +++ ../gsl-0.6/./matrix/gsl_matrix_complex_long_double.h Fri Sep 8 11:21:45 2000 @@ -98,9 +98,9 @@ int gsl_matrix_complex_long_double_transpose (gsl_matrix_complex_long_double * m); -gsl_matrix_complex_long_double gsl_matrix_complex_long_double_submatrix (gsl_matrix_complex_long_double * m, size_t i, size_t j, size_t n1, size_t n2); -gsl_vector_complex_long_double gsl_matrix_complex_long_double_row (gsl_matrix_complex_long_double * m, size_t i); -gsl_vector_complex_long_double gsl_matrix_complex_long_double_column (gsl_matrix_complex_long_double * m, size_t j); +gsl_matrix_complex_long_double gsl_matrix_complex_long_double_submatrix (gsl_matrix_complex_long_double * m, const size_t i, const size_t j, const size_t n1, const size_t n2); +gsl_vector_complex_long_double gsl_matrix_complex_long_double_row (gsl_matrix_complex_long_double * m, const size_t i); +gsl_vector_complex_long_double gsl_matrix_complex_long_double_column (gsl_matrix_complex_long_double * m, const size_t j); gsl_vector_complex_long_double gsl_matrix_complex_long_double_diagonal (gsl_matrix_complex_long_double * m); int gsl_matrix_complex_long_double_isnull (const gsl_matrix_complex_long_double * m); --- ./specfunc/gsl_sf_gamma.h Fri May 19 21:06:28 2000 +++ ../gsl-0.6/./specfunc/gsl_sf_gamma.h Fri Sep 8 11:38:07 2000 @@ -260,8 +260,8 @@ * a > 0, b > 0, 0 <= x <= 1 * exceptions: GSL_EDOM, GSL_EUNDRFLW */ -int gsl_sf_beta_inc_impl(const double a, const double b, double x, gsl_sf_result * result); -int gsl_sf_beta_inc_e(const double a, const double b, double x, gsl_sf_result * result); +int gsl_sf_beta_inc_impl(const double a, const double b, const double x, gsl_sf_result * result); +int gsl_sf_beta_inc_e(const double a, const double b, const double x, gsl_sf_result * result); /* The maximum x such that gamma(x) is not --- ./vector/vector_source.c Fri May 19 21:06:41 2000 +++ ../gsl-0.6/./vector/vector_source.c Fri Sep 8 15:33:49 2000 @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -inline BASE +BASE FUNCTION (gsl_vector, get) (const TYPE (gsl_vector) * v, const size_t i) { if (gsl_check_range) @@ -34,7 +34,7 @@ return *(BASE *) (v->data + MULTIPLICITY * i * v->stride); } -inline void +void FUNCTION (gsl_vector, set) (TYPE (gsl_vector) * v, const size_t i, BASE x) { if (gsl_check_range) --- ./vector/test_complex_source.c Fri May 19 21:06:40 2000 +++ ../gsl-0.6/./vector/test_complex_source.c Fri Sep 8 15:25:03 2000 @@ -112,7 +112,7 @@ { - BASE x, y ; + BASE x, y, v2, v5 ; GSL_REAL(x) = 2 ; GSL_IMAG(x) = 2 + 1234; GSL_REAL(y) = 5 ; @@ -120,13 +120,17 @@ FUNCTION (gsl_vector,swap_elements) (v, 2, 5) ; - status = ! GSL_COMPLEX_EQ(FUNCTION(gsl_vector,get)(v,2),y) ; - status |= ! GSL_COMPLEX_EQ(FUNCTION(gsl_vector,get)(v,5),x) ; + v2 = FUNCTION(gsl_vector,get) (v, 2); + v5 = FUNCTION(gsl_vector,get) (v, 5); + status = ! GSL_COMPLEX_EQ(v2, y) ; + status |= ! GSL_COMPLEX_EQ(v5 ,x) ; FUNCTION (gsl_vector,swap_elements) (v, 2, 5) ; - status |= ! GSL_COMPLEX_EQ(FUNCTION(gsl_vector,get)(v,2),x) ; - status |= ! GSL_COMPLEX_EQ(FUNCTION(gsl_vector,get)(v,5),y) ; + v2 = FUNCTION(gsl_vector,get) (v, 2); + v5 = FUNCTION(gsl_vector,get) (v, 5); + status |= ! GSL_COMPLEX_EQ(v2,x) ; + status |= ! GSL_COMPLEX_EQ(v5,y) ; } gsl_test (status, NAME(gsl_vector) "_swap_elements" DESC " exchanges elements correctly") ; @@ -137,11 +141,12 @@ for (i = 0; i < N; i++) { - BASE x ; + BASE x, vi ; GSL_REAL(x) = N - i - 1 ; GSL_IMAG(x) = N - i - 1 + 1234; - status |= !GSL_COMPLEX_EQ(FUNCTION (gsl_vector, get) (v, i),x); + vi = FUNCTION (gsl_vector, get) (v, i); + status |= !GSL_COMPLEX_EQ(vi ,x); } gsl_test (status, NAME(gsl_vector) "_reverse" DESC " reverses elements correctly") ; --- ./integration/err.c Fri May 19 21:05:43 2000 +++ ../gsl-0.6/./integration/err.c Fri Sep 8 12:01:22 2000 @@ -23,7 +23,7 @@ #include #include -static double rescale_error (double err, double result_abs, double result_asc) ; +static double rescale_error (double err, const double result_abs, const double result_asc) ; static double rescale_error (double err, const double result_abs, const double result_asc) --- ./statistics/wmean_source.c Thu May 4 07:25:08 2000 +++ ../gsl-0.6/./statistics/wmean_source.c Fri Sep 8 11:53:30 2000 @@ -18,7 +18,7 @@ */ double -FUNCTION (gsl_stats, wmean) (const BASE w[], size_t wstride, const BASE data[], const size_t stride, const size_t size) +FUNCTION (gsl_stats, wmean) (const BASE w[], const size_t wstride, const BASE data[], const size_t stride, const size_t size) { /* Compute the weighted arithmetic mean M of a dataset using the recurrence relation --- ./interpolation/cspline.c Fri May 19 21:05:45 2000 +++ ../gsl-0.6/./interpolation/cspline.c Thu Sep 7 13:28:57 2000 @@ -134,7 +134,9 @@ gsl_vector * diag = gsl_vector_alloc(sys_size); gsl_vector * offdiag = gsl_vector_alloc(sys_size); - gsl_vector solution_vec = { sys_size, 1, interp->c + 1, 0 }; + gsl_vector solution_vec = { -1 /*sys_size*/, 1, NULL /*interp->c+1*/, 0 }; + solution_vec.size = sys_size; + solution_vec.data = interp->c + 1; if (g == 0 || diag == 0 || offdiag == 0) { @@ -208,7 +210,10 @@ gsl_vector * g = gsl_vector_alloc(sys_size); gsl_vector * diag = gsl_vector_alloc(sys_size); gsl_vector * offdiag = gsl_vector_alloc(sys_size); - gsl_vector solution_vec = { sys_size, 1, interp->c + 1, 0 }; + + gsl_vector solution_vec = { -1 /*sys_size*/, 1, NULL /*interp->c+1*/, 0 }; + solution_vec.size = sys_size; + solution_vec.data = interp->c + 1; if (g == 0 || diag == 0 || offdiag == 0) { status = GSL_ENOMEM; --- ./permutation/gsl_permute_long_double.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_long_double.h Fri Sep 8 11:28:38 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_long_double (const size_t * p, long double * data, size_t stride, size_t n); -int gsl_permute_long_double_inverse (const size_t * p, long double * data, size_t stride, size_t n); +int gsl_permute_long_double (const size_t * p, long double * data, const size_t stride, const size_t n); +int gsl_permute_long_double_inverse (const size_t * p, long double * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_uchar.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_uchar.h Fri Sep 8 11:28:23 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_uchar (const size_t * p, unsigned char * data, size_t stride, size_t n); -int gsl_permute_uchar_inverse (const size_t * p, unsigned char * data, size_t stride, size_t n); +int gsl_permute_uchar (const size_t * p, unsigned char * data, const size_t stride, const size_t n); +int gsl_permute_uchar_inverse (const size_t * p, unsigned char * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_ushort.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_ushort.h Fri Sep 8 11:27:52 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_ushort (const size_t * p, unsigned short * data, size_t stride, size_t n); -int gsl_permute_ushort_inverse (const size_t * p, unsigned short * data, size_t stride, size_t n); +int gsl_permute_ushort (const size_t * p, unsigned short * data, const size_t stride, const size_t n); +int gsl_permute_ushort_inverse (const size_t * p, unsigned short * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_short.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_short.h Fri Sep 8 11:28:31 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_short (const size_t * p, short * data, size_t stride, size_t n); -int gsl_permute_short_inverse (const size_t * p, short * data, size_t stride, size_t n); +int gsl_permute_short (const size_t * p, short * data, const size_t stride, const size_t n); +int gsl_permute_short_inverse (const size_t * p, short * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_ulong.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_ulong.h Fri Sep 8 11:28:11 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_ulong (const size_t * p, unsigned long * data, size_t stride, size_t n); -int gsl_permute_ulong_inverse (const size_t * p, unsigned long * data, size_t stride, size_t n); +int gsl_permute_ulong (const size_t * p, unsigned long * data, const size_t stride, const size_t n); +int gsl_permute_ulong_inverse (const size_t * p, unsigned long * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_float.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_float.h Fri Sep 8 11:28:49 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_float (const size_t * p, float * data, size_t stride, size_t n); -int gsl_permute_float_inverse (const size_t * p, float * data, size_t stride, size_t n); +int gsl_permute_float (const size_t * p, float * data, const size_t stride, const size_t n); +int gsl_permute_float_inverse (const size_t * p, float * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_double.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_double.h Fri Sep 8 11:28:52 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute (const size_t * p, double * data, size_t stride, size_t n); -int gsl_permute_inverse (const size_t * p, double * data, size_t stride, size_t n); +int gsl_permute (const size_t * p, double * data, const size_t stride, const size_t n); +int gsl_permute_inverse (const size_t * p, double * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_int.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_int.h Fri Sep 8 11:28:45 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_int (const size_t * p, int * data, size_t stride, size_t n); -int gsl_permute_int_inverse (const size_t * p, int * data, size_t stride, size_t n); +int gsl_permute_int (const size_t * p, int * data, const size_t stride, const size_t n); +int gsl_permute_int_inverse (const size_t * p, int * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permutation.h Fri May 19 21:06:02 2000 +++ ../gsl-0.6/./permutation/gsl_permutation.h Fri Sep 8 11:25:39 2000 @@ -43,8 +43,8 @@ typedef struct gsl_permutation_struct gsl_permutation; -gsl_permutation *gsl_permutation_alloc (size_t n); -gsl_permutation *gsl_permutation_calloc (size_t n); +gsl_permutation *gsl_permutation_alloc (const size_t n); +gsl_permutation *gsl_permutation_calloc (const size_t n); void gsl_permutation_init (gsl_permutation * p); void gsl_permutation_free (gsl_permutation * p); --- ./permutation/gsl_permute_long.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_long.h Fri Sep 8 11:28:41 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_long (const size_t * p, long * data, size_t stride, size_t n); -int gsl_permute_long_inverse (const size_t * p, long * data, size_t stride, size_t n); +int gsl_permute_long (const size_t * p, long * data, const size_t stride, const size_t n); +int gsl_permute_long_inverse (const size_t * p, long * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_char.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_char.h Fri Sep 8 11:28:55 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_char (const size_t * p, char * data, size_t stride, size_t n); -int gsl_permute_char_inverse (const size_t * p, char * data, size_t stride, size_t n); +int gsl_permute_char (const size_t * p, char * data, const size_t stride, const size_t n); +int gsl_permute_char_inverse (const size_t * p, char * data, const size_t stride, const size_t n); __END_DECLS --- ./permutation/gsl_permute_uint.h Thu May 4 07:25:05 2000 +++ ../gsl-0.6/./permutation/gsl_permute_uint.h Fri Sep 8 11:28:19 2000 @@ -36,8 +36,8 @@ __BEGIN_DECLS -int gsl_permute_uint (const size_t * p, unsigned int * data, size_t stride, size_t n); -int gsl_permute_uint_inverse (const size_t * p, unsigned int * data, size_t stride, size_t n); +int gsl_permute_uint (const size_t * p, unsigned int * data, const size_t stride, const size_t n); +int gsl_permute_uint_inverse (const size_t * p, unsigned int * data, const size_t stride, const size_t n); __END_DECLS --- ./ltmain.sh Thu Jul 15 15:31:35 1999 +++ ../gsl-0.6/./ltmain.sh Thu Sep 7 13:36:05 2000 @@ -54,8 +54,8 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.3.3 -TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" +VERSION=1.3.5 +TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)" default_mode= help="Try \`$progname --help' for more information." @@ -435,7 +435,7 @@ fbsd_hideous_sh_bug=$base_compile # All platforms use -DPIC, to notify preprocessed assembler code. - command="$base_compile $pic_flag -DPIC $srcfile" + command="$base_compile $srcfile $pic_flag -DPIC" if test "$build_old_libs" = yes; then lo_libobj="$libobj" dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` @@ -521,9 +521,17 @@ exit $error fi + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"` + libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` # Now arrange that obj and lo_libobj become the same file - $show "$LN_S $obj $lo_libobj" - if $run $LN_S $obj $lo_libobj; then + $show "(cd $xdir && $LN_S $baseobj $libobj)" + if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then exit 0 else error=$? @@ -613,8 +621,6 @@ # libtool link mode link) modename="$modename: link" - C_compiler="$CC" # save it, to compile generated C sources - CC="$nonopt" case "$host" in *-*-cygwin* | *-*-mingw* | *-*-os2*) # It is impossible to link a dll without this setting, and @@ -802,8 +808,8 @@ allow_undefined=yes ;; esac - compile_command="$CC" - finalize_command="$CC" + compile_command="$nonopt" + finalize_command="$nonopt" compile_rpath= finalize_rpath= @@ -1691,7 +1697,7 @@ irix) major=`expr $current - $age + 1` - versuffix="$major.$revision" + versuffix=".$major" verstring="sgi$major.$revision" # Add in all the interfaces that we are compatible with. @@ -1789,6 +1795,10 @@ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; + *-*-rhapsody*) + # rhapsody is a little odd... + deplibs="$deplibs -framework System" + ;; *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" @@ -1851,7 +1861,7 @@ int main() { return 0; } EOF $rm conftest - $C_compiler -o conftest conftest.c $deplibs + $CC -o conftest conftest.c $deplibs if test $? -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -1884,7 +1894,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" ; then $rm conftest - $C_compiler -o conftest conftest.c $i + $CC -o conftest conftest.c $i # Did it work? if test $? -eq 0 ; then ldd_output=`ldd conftest` @@ -2047,13 +2057,20 @@ done # Ensure that we have .o objects for linkers which dislike .lo - # (e.g. aix) incase we are running --disable-static + # (e.g. aix) in case we are running --disable-static for obj in $libobjs; do - oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"` - if test ! -f $oldobj; then - $show "${LN_S} $obj $oldobj" - $run ${LN_S} $obj $oldobj || exit $? + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then + xdir="." + else + xdir="$xdir" fi + baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` + if test ! -f $xdir/$oldobj; then + $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" + $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? + fi done # Use standard objects if they are pic @@ -2311,8 +2328,16 @@ # Just create a symlink. $show $rm $libobj $run $rm $libobj - $show "$LN_S $obj $libobj" - $run $LN_S $obj $libobj || exit $? + xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$libobj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` + oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` + $show "(cd $xdir && $LN_S $oldobj $baseobj)" + $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? fi if test -n "$gentop"; then @@ -2598,16 +2623,21 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*) + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) case "$compile_command " in *" -static "*) ;; *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; + esac;; + *-*-hpux*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC";; esac esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" @@ -2776,7 +2806,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi +if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi relink_command=\"$relink_command\" @@ -2865,7 +2895,7 @@ fi" else echo >> $output "\ - program='$outputname$exeext' + program='$outputname' progdir=\"\$thisdir/$objdir\" " fi @@ -2901,13 +2931,21 @@ # Run the actual program with our arguments. " case $host in - *-*-cygwin* | *-*-mingw | *-*-os2*) # win32 systems need to use the prog path for dll # lookup to work + *-*-cygwin*) + $echo >> $output "\ + exec \$progdir/\$program \${1+\"\$@\"} +" + ;; + + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2*) $echo >> $output "\ exec \$progdir\\\\\$program \${1+\"\$@\"} " ;; + *) $echo >> $output "\ # Export the path to the program. @@ -2995,14 +3033,21 @@ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then eval cmds=\"$old_archive_from_new_cmds\" else - # Ensure that we have .o objects in place incase we decided + # Ensure that we have .o objects in place in case we decided # not to build a shared library, and have fallen back to building # static libs even though --disable-static was passed! for oldobj in $oldobjs; do if test ! -f $oldobj; then - obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"` - $show "${LN_S} $obj $oldobj" - $run ${LN_S} $obj $oldobj || exit $? + xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$oldobj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` + obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` + $show "(cd $xdir && ${LN_S} $obj $baseobj)" + $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? fi done @@ -3672,8 +3717,10 @@ done if test -z "$run"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi # Restore saved enviroment variables if test "${save_LC_ALL+set}" = set; then @@ -3690,8 +3737,10 @@ exit 1 else # Display what would be done. - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" + if test -n "$shlibpath_var"; then + eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" + $echo "export $shlibpath_var" + fi $echo "$cmd$args" exit 0 fi --- ./ltconfig Thu Jul 15 15:31:35 1999 +++ ../gsl-0.6/./ltconfig Thu Sep 7 13:36:00 2000 @@ -53,7 +53,7 @@ # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. -if test "X${PATH_SEPARATOR+set}" != "Xset"; then +if test "X${PATH_SEPARATOR+set}" != Xset; then UNAME=${UNAME-`uname 2>/dev/null`} case X$UNAME in *-DOS) PATH_SEPARATOR=';' ;; @@ -63,9 +63,9 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -if test "X${echo_test_string+set}" != "Xset"; then +if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... @@ -169,10 +169,10 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool -VERSION=1.3.3 -TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' +VERSION=1.3.5 +TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)" +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' rm="rm -f" help="Try \`$progname --help' for more information." @@ -369,8 +369,8 @@ # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi +if test "X${LANG+set}" = Xset; then LANG=C; export LANG; fi if test -n "$cache_file" && test -r "$cache_file"; then echo "loading cache $cache_file within ltconfig" @@ -462,7 +462,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "${COLLECT_NAMES+set}" != set; then + if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -663,7 +663,7 @@ link_static_flag='-static' case "$host_os" in - beos* | irix5* | irix6* | osf3* | osf4*) + beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; aix*) @@ -718,7 +718,7 @@ # We can build DLLs from non-PIC. ;; - osf3* | osf4*) + osf3* | osf4* | osf5*) # All OSF/1 code is PIC. wl='-Wl,' link_static_flag='-non_shared' @@ -1164,15 +1164,21 @@ # Extract the symbol export list from an `--export-all' def file, # then regenerate the def file from the symbol export list, so that # the compiled dll only exports the symbol export list. + # Be careful not to strip the DATA tag left by newer dlltools. export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~ - sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols' + sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols' + # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~ _lt_hint=1; - for symbol in `cat $export_symbols`; do - echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def; + cat $export_symbols | while read symbol; do + set dummy \$symbol; + case \$# in + 2) echo " \$2 @ \$_lt_hint ; " >> $objdir/$soname-def;; + *) echo " \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;; + esac; _lt_hint=`expr 1 + \$_lt_hint`; done~ test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ @@ -1187,7 +1193,7 @@ ;; netbsd*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else @@ -1196,7 +1202,7 @@ fi ;; - solaris*) + solaris* | sysv5*) if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <&2 @@ -1244,7 +1250,12 @@ whole_archive_flag_spec= ;; *) - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi ;; esac fi @@ -1405,7 +1416,7 @@ old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' ;; - osf3* | osf4*) + osf3*) if test "$with_gcc" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' @@ -1417,6 +1428,24 @@ hardcode_libdir_separator=: ;; + osf4* | osf5*) # As osf3* with the addition of the -msym flag + if test "$with_gcc" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + rhapsody*) + archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts' + hardcode_libdir_flags_spec='-L$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + sco3.2v5*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_shlibpath_var=no @@ -1449,7 +1478,13 @@ ;; sysv4) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts' + else + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + fi runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no hardcode_direct=no #Motorola manual says yes, but my tests say they lie @@ -1461,6 +1496,18 @@ export_dynamic_flag_spec='-Bexport' ;; + sysv5*) + no_undefined_flag=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' + hardcode_libdir_flag_spec= + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + ;; + uts4*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-L$libdir' @@ -1474,16 +1521,30 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then - # archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs' - archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs' + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4.2uw2*) + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' + hardcode_direct=yes + hardcode_minus_L=no hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH hardcode_runpath_var=yes - ld_shlibs=yes - fi + runpath_var=LD_RUN_PATH ;; + unixware7*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + *) ld_shlibs=no ;; @@ -1589,11 +1650,11 @@ main(){nm_test_var='a';nm_test_func();return(0);} EOF - echo "$progname:1592: checking if global_symbol_pipe works" >&5 - if { (eval echo $progname:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then + echo "$progname:1653: checking if global_symbol_pipe works" >&5 + if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then # Now try to grab the symbols. nlist=conftest.nm - if { echo "$progname:1596: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -1645,7 +1706,7 @@ save_CFLAGS="$CFLAGS" LIBS="conftstm.$objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 @@ -1787,8 +1848,9 @@ bsdi4*) version_type=linux - library_names_spec='${libname}.so$major ${libname}.so' - soname_spec='${libname}.so' + need_version=no + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + soname_spec='${libname}${release}.so$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' @@ -1796,6 +1858,7 @@ file_magic_test_file=/shlib/libc.so sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + export_dynamic_flag_spec=-rdynamic # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs @@ -1841,10 +1904,9 @@ need_version=yes ;; esac - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH case "$host_os" in - freebsd2* | freebsd3.[01]*) + freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes ;; *) # from 3.2 on @@ -1875,6 +1937,14 @@ soname_spec='${libname}${release}.sl$major' # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' + case "$host_os" in + hpux10.20*) + # TODO: Does this work for hpux-11 too? + deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + file_magic_cmd=/usr/bin/file + file_magic_test_file=/usr/lib/libc.sl + ;; + esac ;; irix5* | irix6*) @@ -1881,8 +1951,8 @@ version_type=irix need_lib_prefix=no need_version=no - soname_spec='${libname}${release}.so.$major' - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}.so$versuffix' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' case "$host_os" in irix5*) libsuff= shlibsuff= @@ -1896,8 +1966,6 @@ *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; *) libsuff= shlibsuff= libmagic=never-match;; esac - # this will be overridden with pass_all, but let us keep it just in case - deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" ;; esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH @@ -1924,9 +1992,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + deplibs_check_method=pass_all if test -f /lib/ld.so.1; then dynamic_linker='GNU ld.so' @@ -1972,7 +2038,7 @@ shlibpath_var=LIBPATH ;; -osf3* | osf4*) +osf3* | osf4* | osf5*) version_type=osf need_version=no soname_spec='${libname}${release}.so' @@ -1987,6 +2053,14 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rhapsody*) + version_type=sunos + library_names_spec='${libname}.so' + soname_spec='${libname}.so' + shlibpath_var=DYLD_LIBRARY_PATH + deplibs_check_method=pass_all + ;; + sco3.2v5*) version_type=osf soname_spec='${libname}${release}.so$major' @@ -2027,6 +2101,10 @@ soname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH case "$host_vendor" in + sequent) + file_magic_cmd='/bin/file' + deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; ncr) deplibs_check_method='pass_all' ;; @@ -2167,7 +2245,7 @@ if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then lt_cv_dlopen=no lt_cv_dlopen_libs= echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "$progname:2170: checking for dlopen in -ldl" >&5 +echo "$progname:2248: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2175,10 +2253,13 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2204,12 +2285,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "$progname:2207: checking for dlopen" >&5 +echo "$progname:2288: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2216,6 +2297,9 @@ /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen(); int main() { @@ -2231,7 +2315,7 @@ ; return 0; } EOF -if { (eval echo $progname:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -2248,7 +2332,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "$progname:2251: checking for dld_link in -ldld" >&5 +echo "$progname:2335: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2256,10 +2340,13 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2285,12 +2372,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "$progname:2288: checking for shl_load" >&5 +echo "$progname:2375: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2297,6 +2384,9 @@ /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char shl_load(); int main() { @@ -2312,7 +2402,7 @@ ; return 0; } EOF -if { (eval echo $progname:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -2330,7 +2420,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "$progname:2333: checking for shl_load in -ldld" >&5 +echo "$progname:2423: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2338,11 +2428,14 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2392,17 +2485,17 @@ for ac_hdr in dlfcn.h; do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "$progname:2395: checking for $ac_hdr" >&5 +echo "$progname:2488: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int fnord = 0; EOF -ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo $progname:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_try="$ac_compile >/dev/null 2>conftest.out" +{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2430,7 +2523,7 @@ LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2433: checking whether a program can dlopen itself" >&5 +echo "$progname:2526: checking whether a program can dlopen itself" >&5 if test "${lt_cv_dlopen_self+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2438,7 +2531,7 @@ lt_cv_dlopen_self=cross else cat > conftest.c < @@ -2484,7 +2577,7 @@ if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } EOF -if { (eval echo $progname:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self=yes else @@ -2503,7 +2596,7 @@ if test "$lt_cv_dlopen_self" = yes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2506: checking whether a statically linked program can dlopen itself" >&5 +echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2511,7 +2604,7 @@ lt_cv_dlopen_self_static=cross else cat > conftest.c < @@ -2557,7 +2650,7 @@ if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } EOF -if { (eval echo $progname:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self_static=yes else @@ -2649,7 +2742,7 @@ # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. # # Copyright (C) 1996-1999 Free Software Foundation, Inc. -# Gordon Matzigkeit , 1996 +# Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -2675,7 +2768,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi +if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi ### BEGIN LIBTOOL CONFIG EOF @@ -2938,7 +3031,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "${COLLECT_NAMES+set}" != set; then +if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -2948,6 +3041,10 @@ # Append the ltmain.sh script. sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? chmod +x "$ofile" ;;