Commit aad0eae4 authored by Jason Rumney's avatar Jason Rumney
Browse files

Automatically detect jpeglib.

parent afc390dc
......@@ -86,6 +86,7 @@ if "%1" == "--no-cygwin" goto nocygwin
if "%1" == "--cflags" goto usercflags
if "%1" == "--ldflags" goto userldflags
if "%1" == "--without-png" goto withoutpng
if "%1" == "--without-jpeg" goto withoutjpeg
if "%1" == "" goto checkutils
echo Usage: configure [options]
......@@ -99,6 +100,7 @@ echo. --no-cygwin use -mno-cygwin option with GCC
echo. --cflags FLAG pass FLAG to compiler
echo. --ldflags FLAG pass FLAG to compiler when linking
echo. --without-png do not use libpng even if it is installed
echo. --without-jpeg do not use jpeglib even if it is installed
goto end
rem ----------------------------------------------------------------------
......@@ -152,6 +154,13 @@ set pngsupport=N
goto again
rem ----------------------------------------------------------------------
set jpegsupport=N
goto again
rem ----------------------------------------------------------------------
rem Check that necessary utilities (cp and rm) are present.
......@@ -273,6 +282,26 @@ set HAVE_PNG=1
rm -f junk.c junk.obj
if (%jpegsupport%) == (N) goto jpegDone
echo Checking for jpeg ...
echo #include "jconfig.h" >junk.c
echo main (){} >>junk.c
rem -o option is ignored with cl, but allows result to be consistent.
%COMPILER% %usercflags% -c junk.c -o junk.obj
if exist junk.obj goto haveJpeg
echo ...building without JPEG support.
goto :jpegDone
echo ...JPEG header available, building with JPEG support.
rm -f junk.c junk.obj
rem ----------------------------------------------------------------------
echo Generating makefiles
......@@ -300,6 +329,7 @@ echo /* Start of settings from configure.bat. */ >>..\src\config.h
if not "(%usercflags%)" == "()" echo #define USER_CFLAGS " %usercflags%">>..\src\config.h
if not "(%userldflags%)" == "()" echo #define USER_LDFLAGS " %userldflags%">>..\src\config.h
if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>..\src\config.h
if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>..\src\config.h
echo /* End of settings from configure.bat. */ >>..\src\config.h
copy paths.h ..\src\epaths.h
Markdown is supported
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