diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-04-24 10:11:30 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-04-24 10:16:36 +0200 |
| commit | 2bbbd615d6a3bab89a6df7d7f0d2bb62e3781b43 (patch) | |
| tree | 82f7a9d42451d3db4e34f741bc55fafcad3424ab /configure.in | |
| parent | do not cd get confused by symlinks (diff) | |
| download | core-2bbbd615d6a3bab89a6df7d7f0d2bb62e3781b43.tar.gz core-2bbbd615d6a3bab89a6df7d7f0d2bb62e3781b43.zip | |
move the GXX_INCLUDE_PATH so that it's more obvious it's only for STLPort
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/configure.in b/configure.in index 867a53460ccd..a1568ec5024c 100644 --- a/configure.in +++ b/configure.in @@ -4257,39 +4257,6 @@ fi AC_SUBST([VALGRIND_CFLAGS]) dnl =================================================================== -dnl Set the gcc/gxx include directories -dnl =================================================================== -# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path -# often contains an i386 which is expanded as a macro. -if test "$GXX" = "yes"; then - AC_MSG_CHECKING([for g++ include path]) - if test -z "$with_gxx_include_path"; then - with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - 2>/dev/null | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` - if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then - with_gxx_include_path="/usr/include" - fi - if echo $with_gxx_include_path | $GREP -q linux; then - # workaround for Mandriva - issue 100049 - with_gxx_include_path=`cd -P $with_gxx_include_path && pwd` - fi - fi - dnl This is the original code... - dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include - if test -z "$with_gxx_include_path"; then - with_gxx_include_path="NO_GXX_INCLUDE" - AC_MSG_RESULT([none]) - else - PathFormat "$with_gxx_include_path" - with_gxx_include_path="$formatted_path" - AC_MSG_RESULT([$with_gxx_include_path]) - fi -else - with_gxx_include_path="NO_GXX_INCLUDE" -fi -GXX_INCLUDE_PATH="$with_gxx_include_path" -AC_SUBST(GXX_INCLUDE_PATH) - -dnl =================================================================== dnl Set the MinGW include directories dnl =================================================================== if test "$WITH_MINGW" = "yes"; then @@ -4447,6 +4414,39 @@ fi AC_SUBST(WITH_STLPORT) dnl =================================================================== +dnl gxx include directories needed by STLPort +dnl =================================================================== +# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path +# often contains an i386 which is expanded as a macro. +if test "$GXX" = "yes"; then + AC_MSG_CHECKING([for g++ include path]) + if test -z "$with_gxx_include_path"; then + with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - 2>/dev/null | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` + if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then + with_gxx_include_path="/usr/include" + fi + if echo $with_gxx_include_path | $GREP -q linux; then + # workaround for Mandriva - issue 100049 + with_gxx_include_path=`cd -P $with_gxx_include_path && pwd` + fi + fi + dnl This is the original code... + dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include + if test -z "$with_gxx_include_path"; then + with_gxx_include_path="NO_GXX_INCLUDE" + AC_MSG_RESULT([none]) + else + PathFormat "$with_gxx_include_path" + with_gxx_include_path="$formatted_path" + AC_MSG_RESULT([$with_gxx_include_path]) + fi +else + with_gxx_include_path="NO_GXX_INCLUDE" +fi +GXX_INCLUDE_PATH="$with_gxx_include_path" +AC_SUBST(GXX_INCLUDE_PATH) + +dnl =================================================================== dnl thread-safe statics dnl =================================================================== AC_MSG_CHECKING([whether $CXX supports thread safe statics]) |