AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

install headers in prefix/include/wx-version/wx/ instead of prefix/include/wx/

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2004-07-22 08:28:28 +00:00
parent f53b1c1e6f
commit 166bcebb8e
19 changed files with 65 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -6972,12 +6972,12 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
(cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in $(ALL_HEADERS); do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
@echo " "
@echo " ------------------------------------------------------"

1
build/bakefiles/common_contrib.bkl
View File

@ -33,5 +33,6 @@
<template id="wx_contrib_headers">
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
<install-to>$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)</install-to>
</template>
</makefile>

3
build/bakefiles/wx.bkl
View File

@ -81,6 +81,9 @@
<headers>
<srcdir>$(SRCDIR)/include</srcdir>
<files>$(ALL_HEADERS)</files>
<install-to>
$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)
</install-to>
</headers>
<!-- Locales: -->

16
configure vendored
View File

File diff suppressed because one or more lines are too long

13
configure.in
View File

@ -1353,18 +1353,6 @@ AC_PROG_CXX
AC_LANG_RESTORE
dnl check if compiler includes /usr/local/include in
dnl default include files search path.
AC_MSG_CHECKING([for /usr/local/include in default include path])
GCC_SEARCHES_USR_LOCAL_INCLUDE="no"
if test "$GCC" = "yes" ; then
echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include </,$p' | \
sed -n '1,/End of search list\./p' | \
grep '^ */usr/local/include$' 2>&1 /dev/null \
&& GCC_SEARCHES_USR_LOCAL_INCLUDE="yes"
fi
AC_MSG_RESULT([$GCC_SEARCHES_USR_LOCAL_INCLUDE])
dnl ranlib command
dnl defines RANLIB with the appropriate command
AC_PROG_RANLIB
@ -6246,7 +6234,6 @@ AC_SUBST(MACRESWXCONFIG)
dnl other tools
AC_SUBST(GCC)
AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE)
AC_SUBST(DLLTOOL)
AC_SUBST(AS)
AC_SUBST(NM)

8
contrib/src/animate/Makefile.in
View File

@ -172,12 +172,12 @@ COND_SHARED_0___animatelib___depname = \
all: $(__animatedll___depname) $(__animatelib___depname)
install: all $(__install_animatedll___depname) $(__install_animatelib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/animate/animate.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/deprecated/Makefile.in
View File

@ -199,12 +199,12 @@ COND_SHARED_0___deprecatedlib___depname = \
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/fl/Makefile.in
View File

@ -203,12 +203,12 @@ COND_SHARED_0___fllib___depname = \
all: $(__fldll___depname) $(__fllib___depname)
install: all $(__install_fldll___depname) $(__install_fllib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/gizmos/Makefile.in
View File

@ -181,12 +181,12 @@ COND_SHARED_0___gizmoslib___depname = \
all: $(__gizmosdll___depname) $(__gizmoslib___depname)
install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/mmedia/Makefile.in
View File

@ -224,12 +224,12 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 = \
all: $(__mmediadll___depname) $(__mmedialib___depname)
install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/net/Makefile.in
View File

@ -176,12 +176,12 @@ COND_SHARED_0___netutilslib___depname = \
all: $(__netutilsdll___depname) $(__netutilslib___depname)
install: all $(__install_netutilsdll___depname) $(__install_netutilslib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/ogl/Makefile.in
View File

@ -193,12 +193,12 @@ COND_SHARED_0___ogllib___depname = \
all: $(__ogldll___depname) $(__ogllib___depname)
install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/plot/Makefile.in
View File

@ -171,12 +171,12 @@ COND_SHARED_0___plotlib___depname = \
all: $(__plotdll___depname) $(__plotlib___depname)
install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/stc/Makefile.in
View File

@ -286,12 +286,12 @@ COND_SHARED_0___stclib___depname = \
all: $(__stcdll___depname) $(__stclib___depname)
install: all $(__install_stcdll___depname) $(__install_stclib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/stc/stc.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/svg/Makefile.in
View File

@ -171,12 +171,12 @@ COND_SHARED_0___svglib___depname = \
all: $(__svgdll___depname) $(__svglib___depname)
install: all $(__install_svgdll___depname) $(__install_svglib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/svg/dcsvg.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
contrib/src/xrc/Makefile.in
View File

@ -258,12 +258,12 @@ COND_SHARED_0___xrclib___depname = \
all: $(__xrcdll___depname) $(__xrclib___depname)
install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
src/stc/Makefile.in
View File

@ -286,12 +286,12 @@ COND_SHARED_0___stclib___depname = \
all: $(__stcdll___depname) $(__stclib___depname)
install: all $(__install_stcdll___depname) $(__install_stclib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/stc/stc.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

8
src/xrc/Makefile.in
View File

@ -258,12 +258,12 @@ COND_SHARED_0___xrclib___depname = \
all: $(__xrcdll___depname) $(__xrclib___depname)
install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
done
uninstall:

35
wx-config.in
View File

@ -29,7 +29,6 @@ update_prefixes
CC="@CC@"
GCC="@GCC@"
GCC_SEARCHES_USR_LOCAL_INCLUDE="@GCC_SEARCHES_USR_LOCAL_INCLUDE@"
CXX="@CXX@"
LD="@SHARED_LD@"
srcdir="@top_srcdir@"
@ -194,41 +193,15 @@ EOF
cppflags()
{
# we should never specify -I/usr/include on the compiler command line: this
# is at best useless and at worst breaks compilation on the systems where
# the system headers are non-ANSI because gcc works around this by storing
# the ANSI-fied versions of them in its private directory which is searched
# after all the directories on the cmd line.
#
# the situation is a bit more complicated with -I/usr/local/include:
# it shouldn't be specified with some gcc installations which look there
# by default anyhow and give warnings (at least 3.1 does) if it is
# specified explicitly --
# but this -I switch *is* needed for other gcc installation and for
# the other compilers.
# So I put a suitable test into configure.in and reuse the result here.
#
# note that we assume that if we use GNU cc we also use GNU c++ and vice
# versa, i.e. this won't work (either for --cflags or --cxxflags) if GNU C
# compiler and non-GNU C++ compiler are used or vice versa -- we'll fix
# this when/if anybody complains about it
if test "${includedir}" != "/usr/include" \
-a "${includedir}" != "/usr/include/c++" \
-a \( "${GCC_SEARCHES_USR_LOCAL_INCLUDE}" != "yes" \
-o "${includedir}" != "/usr/local/include" \) \
-a \( "${cross_compiling}" != "yes" \
-o "${includedir}" != "/usr/${target}/include" \) ;
then
includes=" -I${includedir}"
fi
includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes"
includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}"
# in inplace case we need to also add path to contrib headers -- do it
# unconditionally as they might be used and we have no way of knowing if
# they really are
if test $inplace_flag = yes ; then
includes="$includes -I${prefix}/contrib/include"
includes="$includes -I${prefix}/include -I${prefix}/contrib/include"
else
includes="$includes -I${includedir}/wx-${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}"
fi
flags="$includes ${WXDEBUG_DEFINE} ${TOOLCHAIN_DEFS}"