ncurses 5.9 - patch 20121215

[ncurses.git] / configure

diff --git a/configure b/configure
index a0909a0df86c7b07b27f5c290c2b3e2659a04777..4a94a5963de787b680d19dea28b66f588dd51a75 100755 (executable)
--- a/configure
+++ b/configure
@@ -19460,21 +19460,21 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
 
 
 ### Construct the list of include-directories to be generated
 

-CPPFLAGS="$CPPFLAGS -I. -I../include"
-if test "$srcdir" != "."; then
-       CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-fi

 if test "$GCC" != yes; then
 if test "$GCC" != yes; then

-       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+       CPPFLAGS="-I\${includedir} $CPPFLAGS"

 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
                if test $prefix != /usr ; then
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
                if test $prefix != /usr ; then

-                       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+                       CPPFLAGS="-I\${includedir} $CPPFLAGS"

                fi
        else
                fi
        else

-               CPPFLAGS="$CPPFLAGS -I\${includedir}"
+               CPPFLAGS="-I\${includedir} $CPPFLAGS"

        fi
 fi
        fi
 fi

+if test "$srcdir" != "."; then
+       CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
+fi
+CPPFLAGS="-I. -I../include $CPPFLAGS"

 
 ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
 if test "$srcdir" != "."; then
 
 ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
 if test "$srcdir" != "."; then