From 919c97fa65a5c00f7044e849eeb0095408413505 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 6 Apr 2012 23:35:15 +0200 Subject: curl tool: use configuration files from lib directory Configuration files such as curl_config.h and all config-*.h no longer exist nor are generated/copied into 'src' directory, now these only exist in 'lib' directory from where curl tool sources uses them. Additionally old src/setup.h has been refactored into src/tool_setup.h which now pulls lib/setup.h The possibility of a makefile needing an include path adjustment exists. --- src/tool_setup.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/tool_setup.h (limited to 'src/tool_setup.h') diff --git a/src/tool_setup.h b/src/tool_setup.h new file mode 100644 index 000000000..c5c552c86 --- /dev/null +++ b/src/tool_setup.h @@ -0,0 +1,56 @@ +#ifndef HEADER_CURL_TOOL_SETUP_H +#define HEADER_CURL_TOOL_SETUP_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +#define CURL_NO_OLDIES + +#include "setup.h" /* from the lib directory */ + +#if defined(macintosh) && defined(__MRC__) +# define main(x,y) curl_main(x,y) +#endif + +#ifdef TPF +# undef select + /* change which select is used for the curl command line tool */ +# define select(a,b,c,d,e) tpf_select_bsd(a,b,c,d,e) + /* and turn off the progress meter */ +# define CONF_DEFAULT (0|CONF_NOPROGRESS) +#endif + +#ifndef OS +# define OS "unknown" +#endif + +#ifndef UNPRINTABLE_CHAR + /* define what to use for unprintable characters */ +# define UNPRINTABLE_CHAR '.' +#endif + +#ifndef HAVE_STRDUP +# include "strdup.h" +# define strdup(ptr) curlx_strdup(ptr) +#endif + +#endif /* HEADER_CURL_TOOL_SETUP_H */ + -- cgit v1.2.3