Commit 919c97fa authored by Yang Tse's avatar Yang Tse
Browse files

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.
parent 376b4d48

buildconf

+1 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -384,9 +384,6 @@ $PERL -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4 
echo "buildconf: running autoheader"

${AUTOHEADER:-autoheader} || die "autoheader command failed"



echo "buildconf: cp lib/curl_config.h.in src/curl_config.h.in"

cp lib/curl_config.h.in src/curl_config.h.in



echo "buildconf: running autoconf"

${AUTOCONF:-autoconf} || die "autoconf command failed"

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ This configure script may be copied, distributed and modified under the 
terms of the curl license; see COPYING for more details])



AC_CONFIG_SRCDIR([lib/urldata.h])

AM_CONFIG_HEADER(lib/curl_config.h src/curl_config.h include/curl/curlbuild.h)

AM_CONFIG_HEADER(lib/curl_config.h include/curl/curlbuild.h)

AC_CONFIG_MACRO_DIR([m4])

AM_MAINTAINER_MODE

docs/INTERNALS

+3 −3
Original line number Diff line number Diff line
@@ -104,9 +104,9 @@ Windows vs Unix 
 Inside the source code, We make an effort to avoid '#ifdef [Your OS]'. All

 conditionals that deal with features *should* instead be in the format

 '#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,

 we maintain two curl_config-win32.h files (one in lib/ and one in src/) that

 are supposed to look exactly as a curl_config.h file would have looked like on

 a Windows machine!

 we maintain a curl_config-win32.h file in lib directory that is supposed to

 look exactly as a curl_config.h file would have looked like on a Windows

 machine!



 Generally speaking: always remember that this will be compiled on dozens of

 operating systems. Don't walk on the edge.

include/curl/.gitignore

+1 −0
Original line number Diff line number Diff line 
curlbuild.h

stamp-h2

stamp-h3

curlver.h.dist

lib/amigaos.c

+11 −14
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -20,11 +20,14 @@ 
 *

 ***************************************************************************/



#ifdef __AMIGA__ /* Any AmigaOS flavour */

#include "setup.h"



#if defined(__AMIGA__) && !defined(__ixemul__)



#include "amigaos.h"

#include <amitcp/socketbasetags.h>



#include "amigaos.h"



struct Library *SocketBase = NULL;

extern int errno, h_errno;
@@ -35,7 +38,7 @@ void __request(const char *msg); 
# define __request( msg )       Printf( msg "\n\a")

#endif



void amiga_cleanup()

void Curl_amiga_cleanup()

{

  if(SocketBase) {

    CloseLibrary(SocketBase);
@@ -43,7 +46,7 @@ void amiga_cleanup() 
  }

}



BOOL amiga_init()

bool Curl_amiga_init()

{

  if(!SocketBase)

    SocketBase = OpenLibrary("bsdsocket.library", 4);
@@ -61,20 +64,14 @@ BOOL amiga_init() 
  }



#ifndef __libnix__

  atexit(amiga_cleanup);

  atexit(Curl_amiga_cleanup);

#endif



  return TRUE;

}



#ifdef __libnix__

ADD2EXIT(amiga_cleanup,-50);

#endif



#else /* __AMIGA__ */



#ifdef __POCC__

#  pragma warn(disable:2024)  /* Disable warning #2024: Empty input file */

ADD2EXIT(Curl_amiga_cleanup,-50);

#endif



#endif /* __AMIGA__ */
 
#endif /* __AMIGA__ && ! __ixemul__ */