Commit 54972753 authored by slevy's avatar slevy
Browse files

Look for png.h and jpeglib.h in FLTK_INC path (i.e. after calling fltk-config).

Use static GLEW library under mingw (libglew32.a rather than libglew32.dll.a).
parent e450f472
......@@ -22,7 +22,7 @@ dnl -- checks for system services
AC_HEADER_STDC
AC_CHECK_FUNCS(strchr memcpy snprintf strcasecmp rint sqrtf)
AC_CHECK_HEADERS(malloc.h zlib.h png.h jpeglib.h)
AC_CHECK_HEADERS(malloc.h zlib.h)
AC_FUNC_ALLOCA
AC_PROG_CC
......@@ -132,6 +132,10 @@ if test -z "$FLTK_INC"; then
AC_MSG_WARN("Couldn't find fltk-config -- is fltk 1.1.x (or later) installed?")
fi
CXXFLAGS="$CXXFLAGS $FLTK_INC"
CFLAGS="$CFLAGS $FLTK_INC"
AC_CHECK_HEADERS(png.h jpeglib.h)
#----------- as of partiview 0.7.04 - marx: ------------------------------------
#we no longer support old file chooser so we deleted support for it from this file
......@@ -285,7 +289,8 @@ if test -n "$with_glew" && test "$with_glew" != "no"; then
if test -d "$with_glew"; then
AC_DEFINE(HAVE_LIBGLEW, [], [Define if GLEW extension library is present])
if test -n "$MINGW32"; then
GLEW_LIB="$with_glew/lib/libglew32.dll.a"
# GLEW_LIB="$with_glew/lib/libglew32.dll.a"
GLEW_LIB="$with_glew/lib/libglew32.a"
else
GLEW_LIB="$with_glew/lib/libGLEW.a"
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment