[brlcad-commits] SF.net SVN: brlcad:[35425] brlcad/trunk/configure.ac
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2009-08-01 23:28:02
|
Revision: 35425 http://brlcad.svn.sourceforge.net/brlcad/?rev=35425&view=rev Author: brlcad Date: 2009-08-01 23:27:54 +0000 (Sat, 01 Aug 2009) Log Message: ----------- look just a little bit harder for X11 headers since mac os x (10.4) seems to be intermittently setting ac_x_header_dirs to empty yet ac_x_libraries non-empty. X_CFLAGS seems to be no longer used so remove it. Modified Paths: -------------- brlcad/trunk/configure.ac Modified: brlcad/trunk/configure.ac =================================================================== --- brlcad/trunk/configure.ac 2009-08-01 04:05:54 UTC (rev 35424) +++ brlcad/trunk/configure.ac 2009-08-01 23:27:54 UTC (rev 35425) @@ -1546,9 +1546,10 @@ AC_DEFINE(HAVE_GL_GL_H, 1, [Define to 1 if you have the <GL/gl.h> header file.]) gl_include_works="yes" ], [unset ac_cv_header_GL_gl_h]) + # didn't find header, try harder if test "x$gl_include_works" = "xno" ; then # this won't work for paths with spaces - for bc_dir in "$ac_x_includes" `echo $ac_x_header_dirs` ; do + for bc_dir in "$ac_x_includes" `echo $ac_x_header_dirs` `echo $ac_x_libraries | sed 's/\/lib/\/include/g'`; do GL_H_CPPFLAGS="-I$bc_dir" CPPFLAGS="$PRECPPFLAGS $GL_H_CPPFLAGS" AC_MSG_NOTICE([ .. looking in $bc_dir for gl.h]) @@ -1567,9 +1568,10 @@ AC_DEFINE(HAVE_GL_GLX_H, 1, [Define to 1 if you have the <GL/glx.h> header file.]) glx_include_works="yes" ], [unset ac_cv_header_GL_glx_h]) + # didn't find header, try harder if test "x$glx_include_works" = "xno" ; then # this won't work for paths with spaces - for bc_dir in "$ac_x_includes" `echo $ac_x_header_dirs` ; do + for bc_dir in "$ac_x_includes" `echo $ac_x_header_dirs` `echo $ac_x_libraries | sed 's/\/lib/\/include/g'`; do GLX_H_CPPFLAGS="-I$bc_dir" CPPFLAGS="$PRECPPFLAGS $GLX_H_CPPFLAGS" AC_MSG_NOTICE([ .. looking in $bc_dir for glx.h]) @@ -2382,7 +2384,6 @@ fi fi fi -AC_SUBST(X_PREFIX) AC_SUBST(X_CFLAGS) AC_SUBST(X_LIBS) AC_MSG_CHECKING(whether to build against X11) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |