]>
Commit | Line | Data |
---|---|---|
1 | --- tiff-4.0.0/m4/acinclude.m4.orig 2010-07-08 18:10:23.000000000 +0200 | |
2 | +++ tiff-4.0.0/m4/acinclude.m4 2011-12-24 08:14:26.299073546 +0100 | |
3 | @@ -531,7 +531,7 @@ | |
4 | dnl If X is present, assume GLUT depends on it. | |
5 | dnl | |
6 | AS_IF([test X$no_x != Xyes], | |
7 | - [GLUT_LIBS="${X_PRE_LIBS} -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}"]) | |
8 | + [GLUT_LIBS="${X_EXTRA_LIBS} ${GLUT_LIBS}"]) | |
9 | ||
10 | AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut], | |
11 | [ax_cv_check_glut_libglut="no" | |
12 | @@ -540,7 +540,7 @@ | |
13 | CPPFLAGS="${GLUT_CFLAGS} ${CPPFLAGS}" | |
14 | ax_save_LIBS="${LIBS}" | |
15 | LIBS="" | |
16 | -ax_check_libs="-lglut32 -lglut" | |
17 | +ax_check_libs="-lglut" | |
18 | for ax_lib in ${ax_check_libs}; do | |
19 | AS_IF([test X$ax_compiler_ms = Xyes], | |
20 | [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`], |