Commit 7f82d9dc authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Fixup for r3492 and r3484.

parent dc915b02
...@@ -184,6 +184,7 @@ m4/acx_sl_mod_suffix.m4 -text ...@@ -184,6 +184,7 @@ m4/acx_sl_mod_suffix.m4 -text
m4/asx_tr_arg.m4 -text m4/asx_tr_arg.m4 -text
m4/asx_unset.m4 -text m4/asx_unset.m4 -text
m4/ax_pthread.m4 -text m4/ax_pthread.m4 -text
m4/kpse_libtool.m4 -text
m4/libtool.m4 -text m4/libtool.m4 -text
m4/ltoptions.m4 -text m4/ltoptions.m4 -text
m4/ltsugar.m4 -text m4/ltsugar.m4 -text
......
...@@ -111,7 +111,8 @@ am__aclocal_m4_deps = \ ...@@ -111,7 +111,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \ $(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \ $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \ $(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/kpse_libtool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
......
...@@ -1201,6 +1201,7 @@ m4_include([m4/acx_sl_mod_suffix.m4]) ...@@ -1201,6 +1201,7 @@ m4_include([m4/acx_sl_mod_suffix.m4])
m4_include([m4/asx_tr_arg.m4]) m4_include([m4/asx_tr_arg.m4])
m4_include([m4/asx_unset.m4]) m4_include([m4/asx_unset.m4])
m4_include([m4/ax_pthread.m4]) m4_include([m4/ax_pthread.m4])
m4_include([m4/kpse_libtool.m4])
m4_include([m4/libtool.m4]) m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4]) m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4]) m4_include([m4/ltsugar.m4])
......
...@@ -104,7 +104,8 @@ am__aclocal_m4_deps = \ ...@@ -104,7 +104,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \ $(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \ $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \ $(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/kpse_libtool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
......
This diff is collapsed.
...@@ -104,7 +104,8 @@ am__aclocal_m4_deps = \ ...@@ -104,7 +104,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \ $(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \ $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \ $(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/kpse_libtool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
......
...@@ -105,7 +105,8 @@ am__aclocal_m4_deps = \ ...@@ -105,7 +105,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \ $(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \ $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \ $(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/kpse_libtool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
......
...@@ -111,7 +111,8 @@ am__aclocal_m4_deps = \ ...@@ -111,7 +111,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \ $(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \ $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \ $(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/kpse_libtool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
......
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 1995 - 2009 Karl Berry <tex-live@tug.org>
# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holders
# give unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# _KPSE_USE_LIBTOOL()
# Switch link tests over to use libtool so as not to require dependent
# libraries to be listed explicitly.
# Extended for Fortran by Thomas Jahns <jahns@dkrz.de>, 2015
# -------------------
AC_DEFUN([_KPSE_USE_LIBTOOL],
[## $0: Generate a libtool script for use in configure tests
AC_PROVIDE_IFELSE([LT_INIT], ,
[m4_fatal([$0: requires libtool])])[]dnl
LT_OUTPUT
m4_append([AC_LANG(C)],
[ac_link="./libtool --mode=link --tag=CC $ac_link"
])[]dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
[m4_append([AC_LANG(C++)],
[ac_link="./libtool --mode=link --tag=CXX $ac_link"
])])[]dnl
AC_PROVIDE_IFELSE([AC_PROG_FC],
[m4_append([AC_LANG(Fortran)],
[ac_link="./libtool --mode=link --tag=FC $ac_link"
])])[]dnl
AC_PROVIDE_IFELSE([AC_PROG_F77],
[m4_append([AC_LANG(Fortran 77)],
[ac_link="./libtool --mode=link --tag=F77 $ac_link"
])])[]dnl
AC_LANG(_AC_LANG)[]dnl
]) # _KPSE_USE_LIBTOOL
...@@ -116,7 +116,8 @@ am__aclocal_m4_deps = \ ...@@ -116,7 +116,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \ $(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \ $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \ $(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/kpse_libtool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
......
...@@ -33,32 +33,6 @@ const char *cdiStringError(int cdiErrno) ...@@ -33,32 +33,6 @@ const char *cdiStringError(int cdiErrno)
return UnknownError; return UnknownError;
} }
/*
@Function cdiGetStringError
@Title Get CDI Error message from cdiStringError
@Prototype void cdiGetStringError(int cdiErrno, char *name)
@Parameter
@Item cdiErrno CDI error code.
@Item name Corresponding error string
@Description
The function @func{cdiGetStringError} returns a CDI error string.
@Result
@func{cdiGetStringError} a CDI error string.
@EndFunction
*/
void cdiGetStringError(int cdiErrno, char *name)
{
strcpy(name, cdiStringError(cdiErrno));
return;
}
/* /*
* Local Variables: * Local Variables:
* c-file-style: "Java" * c-file-style: "Java"
......
...@@ -124,7 +124,8 @@ am__aclocal_m4_deps = \ ...@@ -124,7 +124,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \ $(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \ $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \ $(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/kpse_libtool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment