From: Adam Dickmeiss Date: Wed, 3 Nov 2010 12:05:16 +0000 (+0100) Subject: Update configure to generate config.h X-Git-Tag: v4.1.4~14^2~23 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=d0e351c12fff564d876958e860338d43716dc269;p=yaz-moved-to-github.git Update configure to generate config.h --- diff --git a/client/admin.c b/client/admin.c index 40a626b..d62b830 100644 --- a/client/admin.c +++ b/client/admin.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/client/bertorture.c b/client/bertorture.c index 599e26f..bd49e93 100644 --- a/client/bertorture.c +++ b/client/bertorture.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #if HAVE_SYS_TYPES_H diff --git a/client/client.c b/client/client.c index c9351d2..445dc52 100644 --- a/client/client.c +++ b/client/client.c @@ -5,6 +5,9 @@ /** \file client.c * \brief yaz-client program */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/client/fhistory.c b/client/fhistory.c index 9eecb27..2a2e124 100644 --- a/client/fhistory.c +++ b/client/fhistory.c @@ -5,6 +5,9 @@ /** \file fhistory.c * \brief file history implementation */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/client/tabcomplete.c b/client/tabcomplete.c index 31c696e..f866d56 100644 --- a/client/tabcomplete.c +++ b/client/tabcomplete.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/configure.ac b/configure.ac index 1f10894..050299b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ dnl This file is part of the YAZ toolkit. dnl Copyright (C) 1995-2010 Index Data AC_PREREQ([2.60]) AC_INIT([yaz],[4.1.2],[yaz-help@indexdata.dk]) +AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.9]) @@ -112,7 +113,7 @@ if test "$openssl" != "no"; then fi AC_MSG_CHECKING([for SSL]) if test "$sslver" != "no"; then - SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS" + AC_DEFINE([HAVE_OPENSSL_SSL_H],[1],[Define to 1 if OpenSSL is present]) AC_MSG_RESULT([$sslver]) else SSL_CFLAGS="" @@ -146,7 +147,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; then fi AC_MSG_CHECKING([for GNU TLS]) if test "$gnutlsver" != "no"; then - SSL_CFLAGS="-DHAVE_GNUTLS_H=1 $SSL_CFLAGS" + AC_DEFINE([HAVE_GNUTLS_H],[1],[Define to 1 if GNUTLS is present]) AC_MSG_RESULT([$gnutlsver]) else SSL_CFLAGS="" @@ -174,13 +175,13 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then #include ],[ rl_attempted_completion_over = 0; - ],AC_DEFINE([HAVE_READLINE_COMPLETION_OVER])) + ],AC_DEFINE([HAVE_READLINE_COMPLETION_OVER],1,[Define to 1 if rl_attempted_completion_over is defined])) AC_TRY_LINK([ #include #include ],[ rl_completion_matches (0, 0); - ],[AC_DEFINE([HAVE_READLINE_RL_COMPLETION_MATCHES])]) + ],[AC_DEFINE([HAVE_READLINE_RL_COMPLETION_MATCHES],1,[Define to 1 if rl_completion_matches is defined])]) LIBS=$xLIBS fi dnl ------ iconv @@ -198,7 +199,7 @@ if test "$with_iconv" != "no"; then ],[ iconv_t t = iconv_open("", ""); ],[ - AC_DEFINE([HAVE_ICONV_H]) + AC_DEFINE([HAVE_ICONV_H],1,[Define to 1 if iconv.h is present]) AC_MSG_RESULT([yes]) ],[ LIBS="$LIBS -liconv" @@ -207,7 +208,7 @@ if test "$with_iconv" != "no"; then ],[ iconv_t t = iconv_open("", ""); ],[ - AC_DEFINE([HAVE_ICONV_H]) + AC_DEFINE([HAVE_ICONV_H],1) AC_MSG_RESULT([yes]) ],[ LIBS="$oldLIBS" @@ -278,8 +279,7 @@ extern int accept(int, struct sockaddr *, size_t t *); ]) ]) AC_MSG_RESULT([$ac_cv_check_socklen_t]) -AC_DEFINE_UNQUOTED([YAZ_SOCKLEN_T],[$ac_cv_check_socklen_t]) -AC_DEFINE([YAZ_USE_NEW_LOG]) +AC_DEFINE_UNQUOTED([YAZ_SOCKLEN_T],[$ac_cv_check_socklen_t],[socklen_t type]) dnl dnl ------ tcpd AC_ARG_ENABLE([tcpd],[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available]) @@ -307,7 +307,7 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then else TCPD_LIBS="-lwrap" AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_TCPD_H]) + AC_DEFINE([HAVE_TCPD_H],1,[Define to 1 if tcp wrap library is present]) fi fi AC_SUBST([TCPD_LIBS]) @@ -336,7 +336,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then LIBS=$OLIBS fi LIBS="$LIBS $PTHREAD_LIBS" - CFLAGS="$CFLAGS -DYAZ_POSIX_THREADS=1" + AC_DEFINE(YAZ_POSIX_THREADS,1,[Define to 1 if POSIX threads is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1" ]) fi @@ -346,18 +346,18 @@ AC_SUBST([XML2_CFLAGS]) xml_enabled=false YAZ_LIBXML2([ - AC_DEFINE(YAZ_HAVE_XML2) + AC_DEFINE(YAZ_HAVE_XML2,1,[Define to 1 if Libxml2 is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1" xml_enabled=true ]) if test "$xml_enabled" = "true"; then YAZ_LIBXSLT([ - AC_DEFINE(YAZ_HAVE_XSLT) + AC_DEFINE(YAZ_HAVE_XSLT,1,[Define to 1 if Libxslt is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1" ]) YAZ_LIBEXSLT([ - AC_DEFINE(YAZ_HAVE_EXSLT) + AC_DEFINE(YAZ_HAVE_EXSLT,1,[Define to 1 if EXSLT is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1" ]) @@ -378,15 +378,6 @@ AC_CHECK_ICU([3.4],[ AC_MSG_WARN([ICU support disabled because XML support is unavailable]) fi ]) -dnl -dnl ------ Memory debugging -AC_ARG_ENABLE([memdebug],[ --enable-memdebug enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none]) -if test "$enable_memdebug" = "yes"; then - AC_DEFINE([TRACE_XMALLOC],[2]) -elif test "$enable_memdebug" = "no"; then - AC_DEFINE([TRACE_XMALLOC],[0]) -fi -dnl dnl ------ versioning dnl WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'` diff --git a/src/ccl_stop_words.c b/src/ccl_stop_words.c index 9d06f98..3165378 100644 --- a/src/ccl_stop_words.c +++ b/src/ccl_stop_words.c @@ -6,6 +6,9 @@ * \file ccl_stop_words.c * \brief Removes stop words from terms in RPN tree */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/cclerrms.c b/src/cclerrms.c index 2d69c39..c6553f5 100644 --- a/src/cclerrms.c +++ b/src/cclerrms.c @@ -9,6 +9,9 @@ * This source file implements mapping between CCL error code and * their string equivalents. */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/cclfind.c b/src/cclfind.c index 87a216c..0a2c272 100644 --- a/src/cclfind.c +++ b/src/cclfind.c @@ -11,6 +11,9 @@ * of lookahead in the handling of relational operations.. So * it's not really pure. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/cclptree.c b/src/cclptree.c index 98e6bb8..057c92b 100644 --- a/src/cclptree.c +++ b/src/cclptree.c @@ -9,6 +9,9 @@ * This source file implements functions to parse and print * a CCL node tree (as a result of parsing). */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/cclqfile.c b/src/cclqfile.c index a2bb336..246b832 100644 --- a/src/cclqfile.c +++ b/src/cclqfile.c @@ -6,6 +6,9 @@ * \file cclqfile.c * \brief Implements parsing of CCL qualifier specs in files */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/cclqual.c b/src/cclqual.c index bdc499d..28ed642 100644 --- a/src/cclqual.c +++ b/src/cclqual.c @@ -6,6 +6,10 @@ * \file cclqual.c * \brief Implements CCL qualifier utilities */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/cclstr.c b/src/cclstr.c index 1f46616..037be1c 100644 --- a/src/cclstr.c +++ b/src/cclstr.c @@ -6,6 +6,9 @@ * \file cclstr.c * \brief Implements CCL string compare utilities */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include diff --git a/src/ccltoken.c b/src/ccltoken.c index b784295..a793f8b 100644 --- a/src/ccltoken.c +++ b/src/ccltoken.c @@ -6,6 +6,9 @@ * \file ccltoken.c * \brief Implements CCL lexical analyzer (scanner) */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/cclxmlconfig.c b/src/cclxmlconfig.c index d6a8de5..37f0bbe 100644 --- a/src/cclxmlconfig.c +++ b/src/cclxmlconfig.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file cclxmlconfig.c \brief XML configuration for CCL */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/charconv.tcl b/src/charconv.tcl index 5500f59..8f8cc9e 100644 --- a/src/charconv.tcl +++ b/src/charconv.tcl @@ -16,6 +16,11 @@ proc preamble_trie {ofilehandle ifiles ofile} { puts $f " Generated automatically by charconv.tcl" puts $f "*/" puts $f "\#include " + + puts $f "\#if HAVE_CONFIG_H" + puts $f "\#include " + puts $f "\#endif" + puts $f " struct yaz_iconv_trie_flat { char from\[6\]; diff --git a/src/charneg.c b/src/charneg.c index 48b168d..8467ba0 100644 --- a/src/charneg.c +++ b/src/charneg.c @@ -2,13 +2,16 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file charneg.c * \brief Implements Z39.50 Charset negotiation utilities * * Helper functions for Character Set and Language Negotiation - 3 */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/comstack.c b/src/comstack.c index 0df8678..a5f969d 100644 --- a/src/comstack.c +++ b/src/comstack.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file comstack.c * \brief Implements Generic COMSTACK functions */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/copy_types.c b/src/copy_types.c index dc34993..dd2558d 100644 --- a/src/copy_types.c +++ b/src/copy_types.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file copy_types.c \brief Copies various Z39.50 types */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/cql.y b/src/cql.y index 25a4287..6958306 100644 --- a/src/cql.y +++ b/src/cql.y @@ -11,6 +11,9 @@ * This is a YACC parser, but since it must be reentrant, Bison is required. * The original source file is cql.y. */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include diff --git a/src/cqlstdio.c b/src/cqlstdio.c index 6d68439..c3c0a48 100644 --- a/src/cqlstdio.c +++ b/src/cqlstdio.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file cqlstdio.c * \brief Implements query stream reading using FILE handle. */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/cqlstrer.c b/src/cqlstrer.c index 0dac583..dec4cbc 100644 --- a/src/cqlstrer.c +++ b/src/cqlstrer.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file cqlstrer.c * \brief Implements CQL error code map to description string. */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/cqlstring.c b/src/cqlstring.c index 762e5fa..ae9ffd5 100644 --- a/src/cqlstring.c +++ b/src/cqlstring.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file cqlstring.c * \brief Implements query stream reader that reads from a C string. */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/cqltransform.c b/src/cqltransform.c index 55c3366..8f24f19 100644 --- a/src/cqltransform.c +++ b/src/cqltransform.c @@ -2,7 +2,6 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file cqltransform.c * \brief Implements CQL transform (CQL to RPN conversion). @@ -17,6 +16,9 @@ * index * relationModifier */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/cqlutil.c b/src/cqlutil.c index b9ff63f..c20eb7f 100644 --- a/src/cqlutil.c +++ b/src/cqlutil.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file cqlutil.c * \brief Implements CQL tree node utilities. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/csvtodiag.tcl b/src/csvtodiag.tcl index 3124ba9..ce1db5f 100644 --- a/src/csvtodiag.tcl +++ b/src/csvtodiag.tcl @@ -20,6 +20,10 @@ proc csvtodiag {ifiles name alias} { puts $hfile "/** \\file [lindex $ifiles 2]" set preamble " \\brief Diagnostics: Generated by csvtodiag.tcl from [lindex $ifiles 0] */" puts $cfile $preamble + puts $cfile "\#ifdef HAVE_CONFIG_H" + puts $cfile "\#include " + puts $cfile "\#endif" + puts $cfile " #include \"diag-entry.h\" \#include \"[lindex $ifiles 2]\" diff --git a/src/eventl.c b/src/eventl.c index b5ef123..75d738c 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -2,7 +2,6 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file eventl.c * \brief Implements event loop handling for GFS. @@ -10,6 +9,9 @@ * This source implements the main event loop for the Generic Frontend * Server. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/grs1disp.c b/src/grs1disp.c index 1fd2727..e73b1ed 100644 --- a/src/grs1disp.c +++ b/src/grs1disp.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file grs1disp.c * \brief Implements display of GRS-1 records */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/http.c b/src/http.c index 4362c75..9b78cdd 100644 --- a/src/http.c +++ b/src/http.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file http.c * \brief Implements HTTP decoding */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/ill-get.c b/src/ill-get.c index 87e5e1a..2fe5b91 100644 --- a/src/ill-get.c +++ b/src/ill-get.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file ill-get.c * \brief Implements ILL package creator utilities */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/json.c b/src/json.c index 91cb4e4..79231e0 100644 --- a/src/json.c +++ b/src/json.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file json.c * \brief JSON encoding/decoding */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/logrpn.c b/src/logrpn.c index e70db5f..a224ef2 100644 --- a/src/logrpn.c +++ b/src/logrpn.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file logrpn.c * \brief Implements Z39.50 Query Printing */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/match_glob.c b/src/match_glob.c index f498139..43f78cc 100644 --- a/src/match_glob.c +++ b/src/match_glob.c @@ -2,12 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file * \brief Glob expression match */ - +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/oidtoc.tcl b/src/oidtoc.tcl index 314a0d9..fd35d0f 100644 --- a/src/oidtoc.tcl +++ b/src/oidtoc.tcl @@ -109,6 +109,10 @@ proc oid_to_c {srcdir input cname hname} { puts $hfile "\#ifndef OID_STD_H" puts $hfile "\#define OID_STD_H" + puts $cfile "\#if HAVE_CONFIG_H" + puts $cfile "\#include " + puts $cfile "\#endif" + puts $cfile "\#include " puts $cfile "" # To avoid LNK4049 diff --git a/src/opacdisp.c b/src/opacdisp.c index c596f65..e33c715 100644 --- a/src/opacdisp.c +++ b/src/opacdisp.c @@ -6,6 +6,9 @@ * \file opacdisp.c * \brief Implements OPAC record display */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/otherinfo.c b/src/otherinfo.c index 80cb19d..5e6ab78 100644 --- a/src/otherinfo.c +++ b/src/otherinfo.c @@ -6,6 +6,10 @@ * \file otherinfo.c * \brief Implements Z39.50 OtherInfo utilities */ +#if HAVE_CONFIG_H +#include +#endif + #include #include diff --git a/src/poll.c b/src/poll.c index 08e5d46..5f499a1 100644 --- a/src/poll.c +++ b/src/poll.c @@ -6,6 +6,9 @@ * \file * \brief Select, poll wrapper */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/pquery.c b/src/pquery.c index 65dcdd1..41a369d 100644 --- a/src/pquery.c +++ b/src/pquery.c @@ -6,6 +6,10 @@ * \file pquery.c * \brief Implements PQF parsing */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/prt-ext.c b/src/prt-ext.c index ccd2999..6d0d66a 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file prt-ext.c * \brief Implements handling of various Z39.50 Externals */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/query-charset.c b/src/query-charset.c index fed4ba5..308c667 100644 --- a/src/query-charset.c +++ b/src/query-charset.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file query-charset.c \brief converts General Terms in RPN queries */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/querytowrbuf.c b/src/querytowrbuf.c index 3caf21b..80172ee 100644 --- a/src/querytowrbuf.c +++ b/src/querytowrbuf.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file querytowrbuf.c \brief Convert Z39.50 Z_Query to PQF (as WRBUF string) */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/record_render.c b/src/record_render.c index d4180dd..8fbf625 100644 --- a/src/record_render.c +++ b/src/record_render.c @@ -6,6 +6,9 @@ * \file record_render.c * \brief Render Z39.50 records (NamePlusRecord) */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/requestq.c b/src/requestq.c index 2c93d92..f4b6c55 100644 --- a/src/requestq.c +++ b/src/requestq.c @@ -9,6 +9,9 @@ * We also use the request-freelist to store encoding buffers, rather than * freeing and xmalloc'ing them on each cycle. */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/rpn2cql.c b/src/rpn2cql.c index 68b359a..40dafc5 100644 --- a/src/rpn2cql.c +++ b/src/rpn2cql.c @@ -2,12 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file * \brief Implements RPN to CQL conversion - * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/rpn2solr.c b/src/rpn2solr.c index de485ab..24b2a14 100644 --- a/src/rpn2solr.c +++ b/src/rpn2solr.c @@ -2,12 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file * \brief Implements RPN to SOLR conversion - * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/sc.c b/src/sc.c index 4014471..e0d96f5 100644 --- a/src/sc.c +++ b/src/sc.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file sc.c * \brief Windows Service Control */ +#if HAVE_CONFIG_H +#include +#endif #ifdef WIN32 #include diff --git a/src/sc_test.c b/src/sc_test.c index e06a6ba..cd5977d 100644 --- a/src/sc_test.c +++ b/src/sc_test.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file sc_test.c * \brief Small test for the Windows Service Control utility */ +#if HAVE_CONFIG_H +#include +#endif #ifdef WIN32 #include diff --git a/src/seshigh.c b/src/seshigh.c index 378b130..64854a6 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -25,6 +25,9 @@ * minimize memory allocation/deallocation during normal operation. * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/snprintf.c b/src/snprintf.c index 2aedb83..a9f6ba0 100644 --- a/src/snprintf.c +++ b/src/snprintf.c @@ -6,6 +6,9 @@ * \file snprintf.c * \brief snprintf wrapper */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/soap.c b/src/soap.c index 59930d2..1b1452c 100644 --- a/src/soap.c +++ b/src/soap.c @@ -9,6 +9,9 @@ * This implements encoding and decoding of SOAP packages using * Libxml2. */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/src/solr.c b/src/solr.c index 55a86ca..8fa648b 100644 --- a/src/solr.c +++ b/src/solr.c @@ -3,9 +3,12 @@ * See the file LICENSE for details. */ /** - * \file srwutil.c - * \brief Implements SRW/SRU utilities. + * \file solr.c + * \brief Implements SOAP Webservice decoding/encoding */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/solrtransform.c b/src/solrtransform.c index 2d41044..1b323f4 100644 --- a/src/solrtransform.c +++ b/src/solrtransform.c @@ -2,21 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file solrtransform.c * \brief Implements SOLR transform (SOLR to RPN conversion). - * - * Evaluation order of rules: - * - * always - * relation - * structure - * position - * truncation - * index - * relationModifier */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/sortspec.c b/src/sortspec.c index d469718..4c62193 100644 --- a/src/sortspec.c +++ b/src/sortspec.c @@ -6,6 +6,9 @@ * \file sortspec.c * \brief Implements SortSpec parsing. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/srw.c b/src/srw.c index 93ff77c..a34e483 100644 --- a/src/srw.c +++ b/src/srw.c @@ -6,6 +6,9 @@ * \file srw.c * \brief Implements SRW/SRU package encoding and decoding */ +#if HAVE_CONFIG_H +#include +#endif #include #if YAZ_HAVE_XML2 diff --git a/src/srwutil.c b/src/srwutil.c index 2746199..75512ca 100644 --- a/src/srwutil.c +++ b/src/srwutil.c @@ -6,6 +6,9 @@ * \file srwutil.c * \brief Implements SRW/SRU utilities. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/statserv.c b/src/statserv.c index d340a17..faca797 100644 --- a/src/statserv.c +++ b/src/statserv.c @@ -8,6 +8,10 @@ * \brief Implements GFS logic */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/tcpdchk.c b/src/tcpdchk.c index 24bf471..a97134f 100644 --- a/src/tcpdchk.c +++ b/src/tcpdchk.c @@ -7,6 +7,10 @@ * \brief Implements TCP WRAPPER check. */ +#if HAVE_CONFIG_H +#include +#endif + #include #include diff --git a/src/tcpip.c b/src/tcpip.c index dc1d127..b0ea098 100644 --- a/src/tcpip.c +++ b/src/tcpip.c @@ -6,6 +6,9 @@ * \file tcpip.c * \brief Implements TCP/IP + SSL COMSTACK. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/tokenizer.c b/src/tokenizer.c index cf76c89..bece9a8 100644 --- a/src/tokenizer.c +++ b/src/tokenizer.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file tokenizer.c * \brief Simple tokenizer system. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/unix.c b/src/unix.c index 8006a61..56dacc4 100644 --- a/src/unix.c +++ b/src/unix.c @@ -6,6 +6,9 @@ * \file unix.c * \brief Implements UNIX domain socket COMSTACK */ +#if HAVE_CONFIG_H +#include +#endif #ifndef WIN32 diff --git a/src/uri.c b/src/uri.c index cb4fc25..5654dae 100644 --- a/src/uri.c +++ b/src/uri.c @@ -3,9 +3,12 @@ * See the file LICENSE for details. */ /** - * \file srwutil.c - * \brief Implements SRW/SRU utilities. + * \file uri.c + * \brief Implements URI utilities. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/waislen.c b/src/waislen.c index 9e44ab2..36f9798 100644 --- a/src/waislen.c +++ b/src/waislen.c @@ -6,6 +6,9 @@ * \file waislen.c * \brief Implements WAIS package handling */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/xcqlutil.c b/src/xcqlutil.c index 32fde13..30be8ac 100644 --- a/src/xcqlutil.c +++ b/src/xcqlutil.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file xcqlutil.c * \brief Implements CQL to XCQL conversion. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/xmlerror.c b/src/xmlerror.c index 26b5840..efb7ebc 100644 --- a/src/xmlerror.c +++ b/src/xmlerror.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file \brief Log XML / XSLT Errors via yaz_log */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/xmlquery.c b/src/xmlquery.c index e4d287e..2a401e1 100644 --- a/src/xmlquery.c +++ b/src/xmlquery.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file xmlquery.c \brief Query / XML conversions */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/yaz-ccl.c b/src/yaz-ccl.c index 4bffebe..011be37 100644 --- a/src/yaz-ccl.c +++ b/src/yaz-ccl.c @@ -6,6 +6,9 @@ * \file yaz-ccl.c * \brief Implements CCL node tree to RPN converson. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zgdu.c b/src/zgdu.c index d414406..61f93b0 100644 --- a/src/zgdu.c +++ b/src/zgdu.c @@ -2,11 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** * \file zgdu.c * \brief Implements HTTP and Z39.50 encoding and decoding. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zget.c b/src/zget.c index 03066a8..a7b26e0 100644 --- a/src/zget.c +++ b/src/zget.c @@ -6,6 +6,9 @@ * \file zget.c * \brief Implements Z39.50 package creator utilities */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zoom-c.c b/src/zoom-c.c index d557015..5188381 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -6,6 +6,9 @@ * \file zoom-c.c * \brief Implements ZOOM C interface. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zoom-event.c b/src/zoom-event.c index bc1c84e..1a89f84 100644 --- a/src/zoom-event.c +++ b/src/zoom-event.c @@ -6,6 +6,9 @@ * \file zoom-event.c * \brief Implements ZOOM Event stuff */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zoom-opt.c b/src/zoom-opt.c index 602f57d..0cda581 100644 --- a/src/zoom-opt.c +++ b/src/zoom-opt.c @@ -6,6 +6,10 @@ * \file zoom-opt.c * \brief Implements ZOOM options handling */ +#if HAVE_CONFIG_H +#include +#endif + #include #include "zoom-p.h" diff --git a/src/zoom-query.c b/src/zoom-query.c index 1049873..4553ff3 100644 --- a/src/zoom-query.c +++ b/src/zoom-query.c @@ -6,6 +6,9 @@ * \file zoom-query.c * \brief Implements ZOOM C query interface. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zoom-record-cache.c b/src/zoom-record-cache.c index 9bc4e15..b3ac730 100644 --- a/src/zoom-record-cache.c +++ b/src/zoom-record-cache.c @@ -6,6 +6,9 @@ * \file zoom-record-cache.c * \brief Implements ZOOM record caching */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zoom-socket.c b/src/zoom-socket.c index c0b670f..3916b7a 100644 --- a/src/zoom-socket.c +++ b/src/zoom-socket.c @@ -6,6 +6,9 @@ * \file zoom-socket.c * \brief Implements ZOOM C socket interface. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zoom-sru.c b/src/zoom-sru.c index c6d11e7..05b671c 100644 --- a/src/zoom-sru.c +++ b/src/zoom-sru.c @@ -6,6 +6,9 @@ * \file zoom-sru.c * \brief Implements ZOOM SRU */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/src/zoom-z3950.c b/src/zoom-z3950.c index d13b336..5d6eb2f 100644 --- a/src/zoom-z3950.c +++ b/src/zoom-z3950.c @@ -6,6 +6,9 @@ * \file zoom-z3950.c * \brief Implements ZOOM Z39.50 handling */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_ccl.c b/test/test_ccl.c index 9ebebad..f3b04b3 100644 --- a/test/test_ccl.c +++ b/test/test_ccl.c @@ -2,8 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - -/* CCL test */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_comstack.c b/test/test_comstack.c index eee72f8..df53b2e 100644 --- a/test/test_comstack.c +++ b/test/test_comstack.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_iconv.c b/test/test_iconv.c index 352033a..857dce7 100644 --- a/test/test_iconv.c +++ b/test/test_iconv.c @@ -2,7 +2,6 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - #if HAVE_CONFIG_H #include #endif diff --git a/test/test_json.c b/test/test_json.c index d402c0e..b33c354 100644 --- a/test/test_json.c +++ b/test/test_json.c @@ -1,7 +1,15 @@ +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data + * See the file LICENSE for details. + */ /** * \file * \brief JSON test */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/test/test_log.c b/test/test_log.c index d4a83e5..4b373a6 100644 --- a/test/test_log.c +++ b/test/test_log.c @@ -2,6 +2,10 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/test/test_match_glob.c b/test/test_match_glob.c index 8421752..228402b 100644 --- a/test/test_match_glob.c +++ b/test/test_match_glob.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_matchstr.c b/test/test_matchstr.c index bdb9751..6674644 100644 --- a/test/test_matchstr.c +++ b/test/test_matchstr.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_mutex.c b/test/test_mutex.c index a4483fc..9602c56 100644 --- a/test/test_mutex.c +++ b/test/test_mutex.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_odr.c b/test/test_odr.c index 63ad290..af4a1d4 100644 --- a/test/test_odr.c +++ b/test/test_odr.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include diff --git a/test/test_odrstack.c b/test/test_odrstack.c index e81e4f9..f9a16aa 100644 --- a/test/test_odrstack.c +++ b/test/test_odrstack.c @@ -2,6 +2,10 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/test/test_oid.c b/test/test_oid.c index d00c23a..898176c 100644 --- a/test/test_oid.c +++ b/test/test_oid.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_pquery.c b/test/test_pquery.c index 313df6b..7692857 100644 --- a/test/test_pquery.c +++ b/test/test_pquery.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_query_charset.c b/test/test_query_charset.c index e3c83fc..cc87d53 100644 --- a/test/test_query_charset.c +++ b/test/test_query_charset.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_rpn2cql.c b/test/test_rpn2cql.c index 7aecbb0..e5a0afc 100644 --- a/test/test_rpn2cql.c +++ b/test/test_rpn2cql.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_rpn2solr.c b/test/test_rpn2solr.c index 029552c..b4a690e 100644 --- a/test/test_rpn2solr.c +++ b/test/test_rpn2solr.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_soap1.c b/test/test_soap1.c index eb2ba11..e237a74 100644 --- a/test/test_soap1.c +++ b/test/test_soap1.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #if YAZ_HAVE_XML2 diff --git a/test/test_soap2.c b/test/test_soap2.c index 620f5f3..2f64a9a 100644 --- a/test/test_soap2.c +++ b/test/test_soap2.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_timing.c b/test/test_timing.c index edbca1d..28e2286 100644 --- a/test/test_timing.c +++ b/test/test_timing.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_wrbuf.c b/test/test_wrbuf.c index af06e40..d7013e2 100644 --- a/test/test_wrbuf.c +++ b/test/test_wrbuf.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_xml_include.c b/test/test_xml_include.c index 7a289be..10596cc 100644 --- a/test/test_xml_include.c +++ b/test/test_xml_include.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/test/test_xmlquery.c b/test/test_xmlquery.c index 908adc6..1096d13 100644 --- a/test/test_xmlquery.c +++ b/test/test_xmlquery.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/benchmark.c b/util/benchmark.c index eff9d70..f50c0ac 100644 --- a/util/benchmark.c +++ b/util/benchmark.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/cclsh.c b/util/cclsh.c index 4d24d9c..bb69faf 100644 --- a/util/cclsh.c +++ b/util/cclsh.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/cql2pqf.c b/util/cql2pqf.c index d194da3..9f76c3a 100644 --- a/util/cql2pqf.c +++ b/util/cql2pqf.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/cql2xcql.c b/util/cql2xcql.c index 23afa1a..6474dfd 100644 --- a/util/cql2xcql.c +++ b/util/cql2xcql.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/json-parse.c b/util/json-parse.c index ce1da8b..dae869e 100644 --- a/util/json-parse.c +++ b/util/json-parse.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/srwtst.c b/util/srwtst.c index bace12a..b37b302 100644 --- a/util/srwtst.c +++ b/util/srwtst.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/yaz-asncomp b/util/yaz-asncomp index d02bd9d..2c32c00 100755 --- a/util/yaz-asncomp +++ b/util/yaz-asncomp @@ -1092,6 +1092,11 @@ proc asnModules {} { puts $file(outc) "" puts $file(outc) " ${greeting} ${yc_version}" puts $file(outc) "*/" + + puts $file(outc) "\#if HAVE_CONFIG_H" + puts $file(outc) "\#include " + puts $file(outc) "\#endif" + puts $file(outc) {} puts $file(outh) "/** \\file $inf(h-file)" diff --git a/util/yaz-illclient.c b/util/yaz-illclient.c index 979400c..a77b208 100644 --- a/util/yaz-illclient.c +++ b/util/yaz-illclient.c @@ -31,6 +31,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/yaz-xmlquery.c b/util/yaz-xmlquery.c index dae8105..241a4e7 100644 --- a/util/yaz-xmlquery.c +++ b/util/yaz-xmlquery.c @@ -2,6 +2,9 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c index 8c06f12..7d93701 100644 --- a/zoom/zoomsh.c +++ b/zoom/zoomsh.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file zoomsh.c \brief ZOOM C command line tool (shell) */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/ztest/dummy-opac.c b/ztest/dummy-opac.c index 7843b20..3fdf19d 100644 --- a/ztest/dummy-opac.c +++ b/ztest/dummy-opac.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file * \brief Little toy-thing to genearate an OPAC record with some values */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/ztest/gfs-example.c b/ztest/gfs-example.c index 2e61d43..801c28c 100644 --- a/ztest/gfs-example.c +++ b/ztest/gfs-example.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file * \brief Demonstration of Generic Frontend Server API */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/ztest/read-grs.c b/ztest/read-grs.c index 441ee34..4821738 100644 --- a/ztest/read-grs.c +++ b/ztest/read-grs.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file * \brief Little toy-thing to read GRS-1 records from a file. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/ztest/read-marc.c b/ztest/read-marc.c index 107e679..9cf0a8c 100644 --- a/ztest/read-marc.c +++ b/ztest/read-marc.c @@ -2,10 +2,12 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file * \brief Little toy-thing to read MARC records from a fixed array. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/ztest/ztest.c b/ztest/ztest.c index 2ef8921..f27cb92 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -2,10 +2,13 @@ * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ - /** \file * \brief yaz-ztest Generic Frontend Server */ +#if HAVE_CONFIG_H +#include +#endif + #include #include