configure.ac (81996412) configure.ac (549fe914)
1dnl /******************************************************************
2dnl * vi:set sw=3 ts=3 et:
3dnl *
4dnl * Name: configure.in
5dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
6dnl * Date: $Date: 2008-09-08 07:38:40 $
7dnl *
8dnl * Desc: This file serves as input for the GNU autoconf package

--- 1334 unchanged lines hidden (view full) ---

1343else
1344 WITH_BINFILTER="NO"
1345 AC_MSG_RESULT([no])
1346fi
1347AC_SUBST(WITH_BINFILTER)
1348
1349if test "$_os" = "WINNT"; then
1350 AC_MSG_CHECKING([whether to use DirectX])
1dnl /******************************************************************
2dnl * vi:set sw=3 ts=3 et:
3dnl *
4dnl * Name: configure.in
5dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
6dnl * Date: $Date: 2008-09-08 07:38:40 $
7dnl *
8dnl * Desc: This file serves as input for the GNU autoconf package

--- 1334 unchanged lines hidden (view full) ---

1343else
1344 WITH_BINFILTER="NO"
1345 AC_MSG_RESULT([no])
1346fi
1347AC_SUBST(WITH_BINFILTER)
1348
1349if test "$_os" = "WINNT"; then
1350 AC_MSG_CHECKING([whether to use DirectX])
1351 ENABLE_DIRECT_DRAW=""
1351 if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
1352 ENABLE_DIRECTX="TRUE"
1353 AC_MSG_RESULT([yes])
1354 else
1355 ENABLE_DIRECTX=""
1356 AC_MSG_RESULT([no])
1357 fi
1358 AC_SUBST(ENABLE_DIRECTX)

--- 4089 unchanged lines hidden (view full) ---

5448 # the "DirectX SDK files not found" error later
5449 else
5450 DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"`
5451 fi
5452 # Remove a possible trailing backslash
5453 DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
5454
5455 if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" ; then
1352 if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
1353 ENABLE_DIRECTX="TRUE"
1354 AC_MSG_RESULT([yes])
1355 else
1356 ENABLE_DIRECTX=""
1357 AC_MSG_RESULT([no])
1358 fi
1359 AC_SUBST(ENABLE_DIRECTX)

--- 4089 unchanged lines hidden (view full) ---

5449 # the "DirectX SDK files not found" error later
5450 else
5451 DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"`
5452 fi
5453 # Remove a possible trailing backslash
5454 DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
5455
5456 if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" ; then
5457 HAVE_DIRECTDRAW_H="yes"
5458 else
5459 HAVE_DIRECTDRAW_H="no"
5460 fi
5461 if test -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then
5456 HAVE_DIRECTXSDK_H="yes"
5457 else
5458 HAVE_DIRECTXSDK_H="no"
5459 fi
5462 HAVE_DIRECTXSDK_H="yes"
5463 else
5464 HAVE_DIRECTXSDK_H="no"
5465 fi
5466
5460 # MS changed the location of the libraries with dec 2004 directx sdk
5461 if test -d "$DIRECTXSDK_HOME/lib/x86" ; then
5462 DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86"
5463 else
5464 DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
5465 fi
5466 if test -f "$DIRECTXSDK_LIB/ddraw.lib" ; then
5467 # MS changed the location of the libraries with dec 2004 directx sdk
5468 if test -d "$DIRECTXSDK_HOME/lib/x86" ; then
5469 DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86"
5470 else
5471 DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
5472 fi
5473 if test -f "$DIRECTXSDK_LIB/ddraw.lib" ; then
5474 HAVE_DIRECTDRAW_LIB="yes"
5475 else
5476 HAVE_DIRECTDRAW_LIB="no"
5477 fi
5478 if test -f "$DIRECTXSDK_LIB/d3d9.lib" ; then
5467 HAVE_DIRECTXSDK_LIB="yes"
5468 else
5469 HAVE_DIRECTXSDK_LIB="no"
5470 fi
5479 HAVE_DIRECTXSDK_LIB="yes"
5480 else
5481 HAVE_DIRECTXSDK_LIB="no"
5482 fi
5483
5484 if test "$HAVE_DIRECTDRAW_H" = "yes" -a "$HAVE_DIRECTDRAW_LIB" = "yes" ; then
5485 ENABLE_DIRECT_DRAW="TRUE"
5486 fi
5487 if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes" ; then
5488 HAVE_DIRECTXSDK="yes"
5489 else
5490 HAVE_DIRECTXSDK="no"
5491 fi
5492
5471 if test -n "$ENABLE_DIRECTX"; then
5493 if test -n "$ENABLE_DIRECTX"; then
5472 if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
5494 if test "$HAVE_DIRECTDRAW" = "yes" -o "$HAVE_DIRECTXSDK" = "yes" ; then
5473 AC_MSG_RESULT([found])
5474 else
5475 AC_MSG_ERROR([DirectX SDK files not found, please use --with-directx-home or --disable-directx.])
5476 fi
5477 else
5478 DIRECTXSDK_HOME=""
5479 AC_MSG_RESULT([disabled])
5480 fi
5481fi
5495 AC_MSG_RESULT([found])
5496 else
5497 AC_MSG_ERROR([DirectX SDK files not found, please use --with-directx-home or --disable-directx.])
5498 fi
5499 else
5500 DIRECTXSDK_HOME=""
5501 AC_MSG_RESULT([disabled])
5502 fi
5503fi
5504AC_SUBST(ENABLE_DIRECT_DRAW)
5482AC_SUBST(DIRECTXSDK_HOME)
5483AC_SUBST(DIRECTXSDK_LIB)
5484
5485dnl ============================================
5486dnl Check for Nullsoft Scriptable Install System
5487dnl ============================================
5488NSIS_PATH=""
5489if test "$_os" = "WINNT" ; then

--- 1931 unchanged lines hidden --- 		5505AC_SUBST(DIRECTXSDK_HOME)
5506AC_SUBST(DIRECTXSDK_LIB)
5507
5508dnl ============================================
5509dnl Check for Nullsoft Scriptable Install System
5510dnl ============================================
5511NSIS_PATH=""
5512if test "$_os" = "WINNT" ; then

--- 1931 unchanged lines hidden ---