From 21423497efe36c70615d0a54e040f76043823345 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 9 Apr 2012 21:24:16 +0200 Subject: configure: Windows cross-compilation fixes BUILDING_LIBCURL and CURL_STATICLIB are no longer defined in curl_config.h, configure will generate appropriate conditionals so that mentioned symbols get defined and used in Makefiles at compilation time --- lib/config-vxworks.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'lib/config-vxworks.h') diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 8e2d05a27..53266c021 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -1,5 +1,5 @@ -#ifndef __LIB_CONFIG_VXWORKS_H -#define __LIB_CONFIG_VXWORKS_H +#ifndef HEADER_CURL_CONFIG_VXWORKS_H +#define HEADER_CURL_CONFIG_VXWORKS_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * 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 @@ -23,12 +23,9 @@ ***************************************************************************/ /* =============================================================== */ -/* lib/config-vxworks.h - Hand crafted config file for VxWorks */ +/* Hand crafted config file for VxWorks */ /* =============================================================== */ -/* when building libcurl itself */ -/* #undef BUILDING_LIBCURL */ - /* Location of default ca bundle */ /* #undef CURL_CA_BUNDLE */ @@ -83,9 +80,6 @@ /* Use Windows LDAP implementation */ /* #undef CURL_LDAP_WIN */ -/* when not building a shared library */ -/* #undef CURL_STATICLIB */ - /* your Entropy Gathering Daemon socket pathname */ /* #undef EGD_SOCKET */ @@ -952,4 +946,4 @@ /* the signed version of size_t */ /* #undef ssize_t */ -#endif /* __LIB_CONFIG_VXWORKS_H */ +#endif /* HEADER_CURL_CONFIG_VXWORKS_H */ -- cgit v1.2.3