Skip to content
Snippets Groups Projects
Commit 38e2bee3 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm explicitit dependence on libhistory (<sbusch); cleanup

parent d2be08ed
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
pub/config.h.in
+ 3
− 3
View file @ 38e2bee3
......@@ -42,12 +42,12 @@
/* Define to 1 if you have the `gslcblas' library (-lgslcblas). */
#undef HAVE_LIBGSLCBLAS
/* Define to 1 if you have the `history' library (-lhistory). */
#undef HAVE_LIBHISTORY
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
/* Define to 1 if you have the `kww' library (-lkww). */
#undef HAVE_LIBKWW
/* Define to 1 if you have the `lmmin' library (-llmmin). */
#undef HAVE_LIBLMMIN
......
pub/configure
+ 43
− 43
View file @ 38e2bee3
......@@ -14873,13 +14873,13 @@ else
as_fn_error "libreadline not found or corrupted" "$LINENO" 5
fi
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for using_history in -lhistory" >&5
$as_echo_n "checking for using_history in -lhistory... " >&6; }
if test "${ac_cv_lib_history_using_history+set}" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yaml_parser_set_input_file in -lyaml" >&5
$as_echo_n "checking for yaml_parser_set_input_file in -lyaml... " >&6; }
if test "${ac_cv_lib_yaml_yaml_parser_set_input_file+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lhistory $LIBS"
LIBS="-lyaml $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
 
......@@ -14889,44 +14889,45 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char using_history ();
char yaml_parser_set_input_file ();
int
main ()
{
return using_history ();
return yaml_parser_set_input_file ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_history_using_history=yes
ac_cv_lib_yaml_yaml_parser_set_input_file=yes
else
ac_cv_lib_history_using_history=no
ac_cv_lib_yaml_yaml_parser_set_input_file=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_history_using_history" >&5
$as_echo "$ac_cv_lib_history_using_history" >&6; }
if test "x$ac_cv_lib_history_using_history" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_yaml_yaml_parser_set_input_file" >&5
$as_echo "$ac_cv_lib_yaml_yaml_parser_set_input_file" >&6; }
if test "x$ac_cv_lib_yaml_yaml_parser_set_input_file" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBHISTORY 1
#define HAVE_LIBYAML 1
_ACEOF
 
LIBS="-lhistory $LIBS"
LIBS="-lyaml $LIBS"
 
else
as_fn_error "libhistory not found or corrupted" "$LINENO" 5
as_fn_error "libyaml not found or out of sync" "$LINENO" 5
fi
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yaml_parser_set_input_file in -lyaml" >&5
$as_echo_n "checking for yaml_parser_set_input_file in -lyaml... " >&6; }
if test "${ac_cv_lib_yaml_yaml_parser_set_input_file+set}" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lm_minimize in -llmmin" >&5
$as_echo_n "checking for lm_minimize in -llmmin... " >&6; }
if test "${ac_cv_lib_lmmin_lm_minimize+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lyaml $LIBS"
LIBS="-llmmin $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
 
......@@ -14936,45 +14937,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char yaml_parser_set_input_file ();
char lm_minimize ();
int
main ()
{
return yaml_parser_set_input_file ();
return lm_minimize ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_yaml_yaml_parser_set_input_file=yes
ac_cv_lib_lmmin_lm_minimize=yes
else
ac_cv_lib_yaml_yaml_parser_set_input_file=no
ac_cv_lib_lmmin_lm_minimize=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_yaml_yaml_parser_set_input_file" >&5
$as_echo "$ac_cv_lib_yaml_yaml_parser_set_input_file" >&6; }
if test "x$ac_cv_lib_yaml_yaml_parser_set_input_file" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lmmin_lm_minimize" >&5
$as_echo "$ac_cv_lib_lmmin_lm_minimize" >&6; }
if test "x$ac_cv_lib_lmmin_lm_minimize" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBYAML 1
#define HAVE_LIBLMMIN 1
_ACEOF
 
LIBS="-lyaml $LIBS"
LIBS="-llmmin $LIBS"
 
else
as_fn_error "libyaml not found por out of sync" "$LINENO" 5
as_fn_error "liblmmin not found or out of sync" "$LINENO" 5
fi
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lm_minimize in -llmmin" >&5
$as_echo_n "checking for lm_minimize in -llmmin... " >&6; }
if test "${ac_cv_lib_lmmin_lm_minimize+set}" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kwwcf in -lkww" >&5
$as_echo_n "checking for kwwcf in -lkww... " >&6; }
if test "${ac_cv_lib_kww_kwwcf+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-llmmin $LIBS"
LIBS="-lkww $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
 
......@@ -14984,35 +14984,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char lm_minimize ();
char kwwcf ();
int
main ()
{
return lm_minimize ();
return kwwcf ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_lmmin_lm_minimize=yes
ac_cv_lib_kww_kwwcf=yes
else
ac_cv_lib_lmmin_lm_minimize=no
ac_cv_lib_kww_kwwcf=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lmmin_lm_minimize" >&5
$as_echo "$ac_cv_lib_lmmin_lm_minimize" >&6; }
if test "x$ac_cv_lib_lmmin_lm_minimize" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kww_kwwcf" >&5
$as_echo "$ac_cv_lib_kww_kwwcf" >&6; }
if test "x$ac_cv_lib_kww_kwwcf" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLMMIN 1
#define HAVE_LIBKWW 1
_ACEOF
 
LIBS="-llmmin $LIBS"
LIBS="-lkww $LIBS"
 
else
as_fn_error "liblmmin not found por out of sync" "$LINENO" 5
as_fn_error "libkww not found or out of sync" "$LINENO" 5
fi
 
 
......
pub/configure.ac
+ 4
− 4
View file @ 38e2bee3
......@@ -45,13 +45,13 @@ AC_CHECK_LIB([fftw3], [fftw_plan_r2r_1d], ,
[AC_MSG_ERROR(libfftw not found or out of sync)])
AC_CHECK_LIB([readline], [readline], ,
[AC_MSG_ERROR(libreadline not found or corrupted)])
AC_CHECK_LIB([history], [using_history], ,
[AC_MSG_ERROR(libhistory not found or corrupted)])
AC_CHECK_LIB([yaml], [yaml_parser_set_input_file], ,
[AC_MSG_ERROR(libyaml not found por out of sync)])
[AC_MSG_ERROR(libyaml not found or out of sync)])
AC_CHECK_LIB([lmmin], [lm_minimize], ,
[AC_MSG_ERROR(liblmmin not found por out of sync)])
[AC_MSG_ERROR(liblmmin not found or out of sync)])
AC_CHECK_LIB([kww], [kwwcf], ,
[AC_MSG_ERROR(libkww not found or out of sync)])
# Checks for header files
## I put this one here only because qmake does: Make sure off_t is 64-bit in *nix, taken from http://www.google.com/search?q=cache:wlNJ8Qe4dBgJ:www.sfr-fresh.com/unix/privat/libfb-v0.18.4b-src.zip:a/src/rtlib/configure.ac+configure.ac+file+offset+bits&hl=de&ct=clnk&cd=5&gl=de&client=firefox-a
......
pub/h deleted 100644 → 0
+ 0
− 138
View file @ d2be08ed
In file included from curve.cpp:16:
expr.h: In constructor ‘CContext::CContext(unsigned int, unsigned int, unsigned int)’:
expr.h:18: warning: ‘CContext::i’ will be initialized after
expr.h:17: warning: ‘CContext::TReqDim CContext::reqDim’
expr.h:21: warning: when initialized here
curve.cpp: In member function ‘std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > COlc::pInfo() const’:
curve.cpp:174: warning: comparison between signed and unsigned integer expressions
curve.cpp:176: warning: comparison between signed and unsigned integer expressions
curve.cpp: In member function ‘std::string COlc::pInfoCat() const’:
curve.cpp:203: warning: comparison between signed and unsigned integer expressions
curve.cpp: In function ‘void NCurveFile::SetFixed(std::string)’:
curve.cpp:262: warning: comparison between signed and unsigned integer expressions
curve.cpp: In function ‘void globalEvaluate(double*, int, double*, void*, int*)’:
curve.cpp:390: warning: comparison between signed and unsigned integer expressions
curve.cpp: In function ‘void NCurveFile::CumulativeDistribution()’:
curve.cpp:828: warning: comparison between signed and unsigned integer expressions
In file included from edif.cpp:15:
expr.h: In constructor ‘CContext::CContext(unsigned int, unsigned int, unsigned int)’:
expr.h:18: warning: ‘CContext::i’ will be initialized after
expr.h:17: warning: ‘CContext::TReqDim CContext::reqDim’
expr.h:21: warning: when initialized here
edif.cpp: In function ‘void NEdif::Dir()’:
edif.cpp:65: warning: zero-length printf format string
edif.cpp: In function ‘void NEdif::ReadIn()’:
edif.cpp:610: warning: comparison between signed and unsigned integer expressions
edif.cpp:639: warning: comparison between signed and unsigned integer expressions
edif.cpp:709: warning: comparison between signed and unsigned integer expressions
edif.cpp:726: warning: comparison between signed and unsigned integer expressions
edif.cpp:727: warning: comparison between signed and unsigned integer expressions
edif.cpp:727: warning: suggest parentheses around && within ||
edif.cpp: In function ‘void NEdif::ReadTab(std::string)’:
edif.cpp:843: warning: comparison between signed and unsigned integer expressions
edif.cpp:845: warning: comparison between signed and unsigned integer expressions
edif.cpp:857: warning: comparison between signed and unsigned integer expressions
edif.cpp:883: warning: comparison between signed and unsigned integer expressions
edif.cpp:886: warning: comparison between signed and unsigned integer expressions
edif.cpp:891: warning: comparison between signed and unsigned integer expressions
edif.cpp: In function ‘void NEdif::MakeGrid()’:
edif.cpp:960: warning: comparison between signed and unsigned integer expressions
edif.cpp: In function ‘void NEdif::Plot(CPlot*, bool)’:
edif.cpp:1042: warning: comparison between signed and unsigned integer expressions
edif.cpp:1155: warning: comparison between signed and unsigned integer expressions
edif.cpp:1161: warning: comparison between signed and unsigned integer expressions
edif.cpp:1215: warning: comparison between signed and unsigned integer expressions
edif.cpp:996: warning: ‘sup’ may be used uninitialized in this function
edif.cpp:996: warning: ‘inf’ may be used uninitialized in this function
edif.cpp:1188: warning: ‘s’ may be used uninitialized in this function
edif.cpp: In function ‘void NEdif::ReadIn()’:
edif.cpp:580: warning: ‘zold’ may be used uninitialized in this function
In file included from expr.cpp:14:
expr.h: In constructor ‘CContext::CContext(unsigned int, unsigned int, unsigned int)’:
expr.h:18: warning: ‘CContext::i’ will be initialized after
expr.h:17: warning: ‘CContext::TReqDim CContext::reqDim’
expr.h:21: warning: when initialized here
expr.cpp: In member function ‘void CRef::ref_val(CTOut*, const CContext*) const’:
expr.cpp:148: warning: comparison between signed and unsigned integer expressions
expr.cpp: In member function ‘void CTree::tree_uival(unsigned int*, const CContext*) const’:
expr.cpp:415: warning: unused variable ‘aux’
expr.cpp: In member function ‘void CTree::tree_val(CTOut*, const CContext*) const’:
expr.cpp:456: warning: comparison between signed and unsigned integer expressions
expr.cpp:468: warning: comparison between signed and unsigned integer expressions
expr.cpp:472: warning: comparison between signed and unsigned integer expressions
expr.cpp:492: warning: comparison between signed and unsigned integer expressions
expr.cpp:499: warning: comparison between signed and unsigned integer expressions
expr.cpp:506: warning: comparison between signed and unsigned integer expressions
expr.cpp:571: warning: comparison between signed and unsigned integer expressions
expr.cpp:576: warning: comparison between signed and unsigned integer expressions
expr.cpp:592: warning: comparison between signed and unsigned integer expressions
expr.cpp:600: warning: comparison between signed and unsigned integer expressions
expr.cpp:611: warning: comparison between signed and unsigned integer expressions
expr.cpp:614: warning: comparison between signed and unsigned integer expressions
expr.cpp:627: warning: comparison between signed and unsigned integer expressions
expr.cpp:646: warning: comparison between signed and unsigned integer expressions
expr.cpp:648: warning: comparison between signed and unsigned integer expressions
expr.cpp:655: warning: comparison between signed and unsigned integer expressions
expr.cpp:660: warning: comparison between signed and unsigned integer expressions
expr.cpp: In static member function ‘static unsigned int CTree::setConvJ(unsigned int, unsigned int, unsigned int)’:
expr.cpp:788: warning: comparison between signed and unsigned integer expressions
expr.cpp: In member function ‘void CTree::tree_val(CTOut*, const CContext*) const’:
expr.cpp:497: warning: ‘sv’ may be used uninitialized in this function
expr.cpp:495: warning: ‘conv_step’ may be used uninitialized in this function
file_io.cpp: In function ‘void NFileIO::Load_08(FILE*, std::string)’:
file_io.cpp:77: warning: unused variable ‘nj’
file_io.cpp:77: warning: unused variable ‘j’
file_io.cpp: In function ‘void NFileIO::LoadScan_01(FILE*, CScan*, int)’:
file_io.cpp:286: warning: the address of ‘lab’ will always evaluate as ‘true’
file_io.cpp:287: warning: comparison between signed and unsigned integer expressions
file_io.cpp:289: warning: comparison between signed and unsigned integer expressions
file_io.cpp:299: warning: the address of ‘lab’ will always evaluate as ‘true’
In file included from frida2.cpp:16:
expr.h: In constructor ‘CContext::CContext(unsigned int, unsigned int, unsigned int)’:
expr.h:18: warning: ‘CContext::i’ will be initialized after
expr.h:17: warning: ‘CContext::TReqDim CContext::reqDim’
expr.h:21: warning: when initialized here
In file included from manip.cpp:17:
expr.h: In constructor ‘CContext::CContext(unsigned int, unsigned int, unsigned int)’:
expr.h:18: warning: ‘CContext::i’ will be initialized after
expr.h:17: warning: ‘CContext::TReqDim CContext::reqDim’
expr.h:21: warning: when initialized here
manip.cpp: In function ‘void NManip::PtsGroupWeighted()’:
manip.cpp:416: warning: suggest parentheses around && within ||
manip.cpp:435: warning: comparison between signed and unsigned integer expressions
manip.cpp:455: warning: comparison between signed and unsigned integer expressions
manip.cpp:476: warning: comparison between signed and unsigned integer expressions
manip.cpp: In function ‘void NManip::ScaSpawn()’:
manip.cpp:751: warning: comparison between signed and unsigned integer expressions
manip.cpp: In function ‘void NManip::ZExchange()’:
manip.cpp:932: warning: comparison between signed and unsigned integer expressions
manip.cpp:978: warning: ‘num2’ may be used uninitialized in this function
In file included from opr.cpp:15:
expr.h: In constructor ‘CContext::CContext(unsigned int, unsigned int, unsigned int)’:
expr.h:18: warning: ‘CContext::i’ will be initialized after
expr.h:17: warning: ‘CContext::TReqDim CContext::reqDim’
expr.h:21: warning: when initialized here
opr.cpp: In function ‘void NOperate::IntXY()’:
opr.cpp:371: warning: comparison between signed and unsigned integer expressions
opr.cpp:371: warning: comparison between signed and unsigned integer expressions
opr.cpp: In function ‘void NOperate::CalcAvgeDiff()’:
opr.cpp:675: warning: ‘f1’ may be used uninitialized in this function
rssm.cpp: In member function ‘void RssmRawFile::RdRawYam(FILE*)’:
rssm.cpp:130: warning: comparison between signed and unsigned integer expressions
rssm.cpp:151: warning: comparison between signed and unsigned integer expressions
rssm.cpp:153: warning: comparison between signed and unsigned integer expressions
rssm.cpp:160: warning: comparison between signed and unsigned integer expressions
rssm.cpp:185: warning: comparison between signed and unsigned integer expressions
rssm.cpp:187: warning: comparison between signed and unsigned integer expressions
rssm.cpp:194: warning: comparison between signed and unsigned integer expressions
rssm.cpp: In function ‘void NRSSM::ReadScan(int, int)’:
rssm.cpp:291: warning: comparison between signed and unsigned integer expressions
rssm.cpp:306: warning: comparison between signed and unsigned integer expressions
rssm.cpp:325: warning: comparison between signed and unsigned integer expressions
rssm.cpp:340: warning: comparison between signed and unsigned integer expressions
rssm.cpp: In function ‘void NRSSM::ReadSeries(int, int)’:
rssm.cpp:450: warning: comparison between signed and unsigned integer expressions
rssm.cpp:517: warning: comparison between signed and unsigned integer expressions
rssm.cpp:565: warning: comparison between signed and unsigned integer expressions
special2.cpp: In function ‘void NSpecial::FourierCosine()’:
special2.cpp:54: warning: comparison between signed and unsigned integer expressions
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