Commit eb438719 authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

OS400: adjust inclusion paths in include files to avoid "include file not found" in DB2 mode.

parent 44e2832b

packages/OS400/ccsidcurl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,8 +32,8 @@ 




#pragma enum(int)

#pragma enum(int)





#include <curl/curl.h>

#include "curl.h"

#include <curl/mprintf.h>

#include "mprintf.h"

#include "urldata.h"

#include "urldata.h"

#include "url.h"

#include "url.h"

#include "getinfo.h"

#include "getinfo.h"

packages/OS400/ccsidcurl.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -25,9 +25,9 @@ 
#ifndef __CURL_CCSIDCURL_H

#ifndef __CURL_CCSIDCURL_H

#define __CURL_CCSIDCURL_H

#define __CURL_CCSIDCURL_H





#include <curl.h>

#include "curl.h"

#include <easy.h>

#include "easy.h"

#include <multi.h>

#include "multi.h"









CURL_EXTERN char * curl_version_ccsid(unsigned int ccsid);

CURL_EXTERN char * curl_version_ccsid(unsigned int ccsid);

packages/OS400/make-include.sh

+12 −2
Original line number Original line Diff line number Diff line
@@ -35,15 +35,25 @@ fi 
copy_hfile()

copy_hfile()





{

{

	destfile="${1}"

	srcfile="${2}"

	shift

	shift

        sed -e '1i\

        sed -e '1i\

#pragma enum(int)\

#pragma enum(int)\

' -e '$a\

' "${@}" -e '$a\

#pragma enum(pop)\

#pragma enum(pop)\

' < "${2}" > "${1}"

' < "${srcfile}" > "${destfile}"

}

}





#       Copy the header files.

#       Copy the header files.





DEST="${SRCPF}/`db2_name curl/curl.h`.MBR"

if action_needed "${DEST}" curl/curl.h

then	copy_hfile "${DEST}" curl/curl.h -e                             \

            's/^# *include  *[<"]curl\/curlbuild.h[">]/#include "curlbuild.h"/'

fi



for HFILE in curl/*.h ${SCRIPTDIR}/ccsidcurl.h

for HFILE in curl/*.h ${SCRIPTDIR}/ccsidcurl.h

do      DEST="${SRCPF}/`db2_name \"${HFILE}\"`.MBR"

do      DEST="${SRCPF}/`db2_name \"${HFILE}\"`.MBR"

        if action_needed "${DEST}" "${HFILE}"

        if action_needed "${DEST}" "${HFILE}"