switch AH macros

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5587 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-11-06 09:41:27 +00:00
parent 4958225ac5
commit c5e3dde14a
2 changed files with 32 additions and 21 deletions

View File

@ -1,3 +1,8 @@
2002-11-06 Lars Gullik Bjønnes <larsbj@gullik.net>
* configure.ac: use AH_TOP and AH_BOTTOM instead of
AH_VERBATIM
2002-11-05 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-11-05 Lars Gullik Bjønnes <larsbj@birdstep.com>
* configure.ac (AH_VERBATIM): fix keys to be unique * configure.ac (AH_VERBATIM): fix keys to be unique

View File

@ -290,39 +290,49 @@ AC_SUBST(VERSION_INFO)
## Some config.h stuff ## Some config.h stuff
AH_VERBATIM([HAVE_STRCHR2], AH_TOP([
[ /* -*- C++ -*- */
/* This is the compilation configuration file for LyX. It was generated by
autoconf's configure. You might want to change some of the defaults if
something goes wrong during the compilation
* This file is part of
* ======================================================
*
* LyX, the High Level Word Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
*======================================================*/
#ifndef _CONFIG_H
#define _CONFIG_H
])
AH_BOTTOM([
/************************************************************
** You should not need to change anything beyond this point */
#ifndef HAVE_STRCHR #ifndef HAVE_STRCHR
# define strchr(a,b) index(a,b) # define strchr(a,b) index(a,b)
#endif #endif
])
AH_VERBATIM([HAVE_MEMMOVE2],
[
#ifndef HAVE_MEMMOVE #ifndef HAVE_MEMMOVE
# define memmove(a,b,c) bcopy(b,a,c) # define memmove(a,b,c) bcopy(b,a,c)
#endif #endif
])
AH_VERBATIM([HAVE_STRERROR2],
[
#ifndef HAVE_STRERROR #ifndef HAVE_STRERROR
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" extern "C"
#endif #endif
char * strerror(int n); char * strerror(int n);
#endif #endif
])
AH_VERBATIM([BROKEN_HEADERS2],
[
#ifdef BROKEN_HEADERS #ifdef BROKEN_HEADERS
#include "broken_headers.h" #include "broken_headers.h"
#endif #endif
])
AH_VERBATIM([HAVE_MKSTEMP2],
[
#ifdef HAVE_MKSTEMP #ifdef HAVE_MKSTEMP
#ifndef HAVE_DECL_MKSTEMP #ifndef HAVE_DECL_MKSTEMP
#if defined(__cplusplus) #if defined(__cplusplus)
@ -331,19 +341,15 @@ extern "C"
int mkstemp(char*); int mkstemp(char*);
#endif #endif
#endif #endif
])
AH_VERBATIM([__EMX__2],
[
#ifdef __EMX__ #ifdef __EMX__
#include "support/os2_defines.h" #include "support/os2_defines.h"
#endif #endif
])
AH_VERBATIM([__CYGWIN__2],
[
#if defined(__CYGWIN__) || defined(__CYGWIN32__) #if defined(__CYGWIN__) || defined(__CYGWIN32__)
#include "support/nt_defines.h" #include "support/nt_defines.h"
#endif
#endif #endif
]) ])