Replace INCLUDES with CPPFLAGS.
This commit is contained in:
parent
170256366d
commit
1dd55fd57c
8
configure
vendored
8
configure
vendored
@ -23493,7 +23493,7 @@ echo "$as_me: error: Zlib library not found at $with_zlib_lib_dir" >&2;}
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_zlib_include_dir" != "x" ; then
|
if test "x$with_zlib_include_dir" != "x" ; then
|
||||||
INCLUDES="-I$with_zlib_include_dir $INCLUDES"
|
CPPFLAGS="-I$with_zlib_include_dir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
if test "${ac_cv_header_zlib_h+set}" = set; then
|
if test "${ac_cv_header_zlib_h+set}" = set; then
|
||||||
echo "$as_me:$LINENO: checking for zlib.h" >&5
|
echo "$as_me:$LINENO: checking for zlib.h" >&5
|
||||||
@ -23772,7 +23772,7 @@ echo "$as_me: error: IJG JPEG library not found at $with_jpeg_lib_dir" >&2;}
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_jpeg_include_dir" != "x" ; then
|
if test "x$with_jpeg_include_dir" != "x" ; then
|
||||||
INCLUDES="-I$with_jpeg_include_dir $INCLUDES"
|
CPPFLAGS="-I$with_jpeg_include_dir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
if test "${ac_cv_header_jpeglib_h+set}" = set; then
|
if test "${ac_cv_header_jpeglib_h+set}" = set; then
|
||||||
echo "$as_me:$LINENO: checking for jpeglib.h" >&5
|
echo "$as_me:$LINENO: checking for jpeglib.h" >&5
|
||||||
@ -24064,7 +24064,7 @@ echo "$as_me: error: OpenGL library not found at $with_opengl_lib_dir" >&2;}
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_opengl_include_dir" != "x" ; then
|
if test "x$with_opengl_include_dir" != "x" ; then
|
||||||
INCLUDES"-I$with_opengl_include_dir $INCLUDES"
|
CPPFLAGS"-I$with_opengl_include_dir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
if test "${ac_cv_header_GL_gl_h+set}" = set; then
|
if test "${ac_cv_header_GL_gl_h+set}" = set; then
|
||||||
echo "$as_me:$LINENO: checking for GL/gl.h" >&5
|
echo "$as_me:$LINENO: checking for GL/gl.h" >&5
|
||||||
@ -24294,7 +24294,7 @@ echo "$as_me: error: GLUT library not found at $with_glut_lib_dir" >&2;}
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_glut_include_dir" != "x" ; then
|
if test "x$with_glut_include_dir" != "x" ; then
|
||||||
INCLUDES="-I$with_glut_include_dir $INCLUDES"
|
CPPFLAGS="-I$with_glut_include_dir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
if test "${ac_cv_header_GL_glut_h+set}" = set; then
|
if test "${ac_cv_header_GL_glut_h+set}" = set; then
|
||||||
echo "$as_me:$LINENO: checking for GL/glut.h" >&5
|
echo "$as_me:$LINENO: checking for GL/glut.h" >&5
|
||||||
|
@ -212,7 +212,7 @@ if test "x$enable_zlib" != "xno" ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_zlib_include_dir" != "x" ; then
|
if test "x$with_zlib_include_dir" != "x" ; then
|
||||||
INCLUDES="-I$with_zlib_include_dir $INCLUDES"
|
CPPFLAGS="-I$with_zlib_include_dir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no])
|
AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no])
|
||||||
if test "$zlib_h" = "no" -a "x$with_zlib_include_dir" != "x" ; then
|
if test "$zlib_h" = "no" -a "x$with_zlib_include_dir" != "x" ; then
|
||||||
@ -263,7 +263,7 @@ if test "x$enable_jpeg" != "xno" ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_jpeg_include_dir" != "x" ; then
|
if test "x$with_jpeg_include_dir" != "x" ; then
|
||||||
INCLUDES="-I$with_jpeg_include_dir $INCLUDES"
|
CPPFLAGS="-I$with_jpeg_include_dir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
AC_CHECK_HEADER(jpeglib.h, [jpeg_h=yes], [jpeg_h=no])
|
AC_CHECK_HEADER(jpeglib.h, [jpeg_h=yes], [jpeg_h=no])
|
||||||
if test "$jpeg_h" = "no" -a "x$with_jpeg_include_dir" != "x" ; then
|
if test "$jpeg_h" = "no" -a "x$with_jpeg_include_dir" != "x" ; then
|
||||||
@ -317,7 +317,7 @@ if test "x$enable_opengl" != "xno" ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_opengl_include_dir" != "x" ; then
|
if test "x$with_opengl_include_dir" != "x" ; then
|
||||||
INCLUDES"-I$with_opengl_include_dir $INCLUDES"
|
CPPFLAGS"-I$with_opengl_include_dir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
AC_CHECK_HEADER(GL/gl.h, [opengl_h=yes], [opengl_h=no])
|
AC_CHECK_HEADER(GL/gl.h, [opengl_h=yes], [opengl_h=no])
|
||||||
if test "$opengl_h" = "no" -a "x$with_opengl_include_dir" != "x" ; then
|
if test "$opengl_h" = "no" -a "x$with_opengl_include_dir" != "x" ; then
|
||||||
@ -333,7 +333,7 @@ if test "x$enable_opengl" != "xno" ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_glut_include_dir" != "x" ; then
|
if test "x$with_glut_include_dir" != "x" ; then
|
||||||
INCLUDES="-I$with_glut_include_dir $INCLUDES"
|
CPPFLAGS="-I$with_glut_include_dir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
AC_CHECK_HEADER(GL/glut.h, [glut_h=yes], [glut_h=no])
|
AC_CHECK_HEADER(GL/glut.h, [glut_h=yes], [glut_h=no])
|
||||||
if test "$glut_h" = "no" -a "x$with_glut_include_dir" != "x" ; then
|
if test "$glut_h" = "no" -a "x$with_glut_include_dir" != "x" ; then
|
||||||
|
Loading…
Reference in New Issue
Block a user