configure.ac (57d1faa0) configure.ac (8e8da03f)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

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

162[ --disable-directx Remove DirectX implementation for the new XCanvas
163 interface. The DirectX support requires more stuff
164 installed on Windows to compile.
165 (DirectX SDK, GDI+ libs)
166],,enable_directx=yes)
167AC_ARG_ENABLE(activex,
168[ --disable-activex Disable the use of ActiveX for windows build.
169 This switch is mandatory when using VC++ 2005/2008 Express.
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

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

162[ --disable-directx Remove DirectX implementation for the new XCanvas
163 interface. The DirectX support requires more stuff
164 installed on Windows to compile.
165 (DirectX SDK, GDI+ libs)
166],,enable_directx=yes)
167AC_ARG_ENABLE(activex,
168[ --disable-activex Disable the use of ActiveX for windows build.
169 This switch is mandatory when using VC++ 2005/2008 Express.
170 Alternatively you can use the Windows Driver Kit (WDK) and
171 configure with the following switches:
172 --with-atl-include-dir=$WDK_HOME\inc\atl71
173 --with-atl-lib-dir=$WDK_HOME\lib\ATL\i386
174 --with-mfc-include-dir=$WDK_HOME\inc\mfc42
175 --with-mfc-lib-dir=$WDK_HOME\lib\Mfc\i386
170],,)
171
172AC_ARG_ENABLE(atl,
173[ --disable-atl Disable the use of ATL for windows build.
174 This switch is mandatory when using VC++ 2005/2008 Express.
176],,)
177
178AC_ARG_ENABLE(atl,
179[ --disable-atl Disable the use of ATL for windows build.
180 This switch is mandatory when using VC++ 2005/2008 Express.
181 Alternatively you can use the Windows Driver Kit (WDK) and
182 configure with the following switches:
183 --with-atl-include-dir=$WDK_HOME\inc\atl71
184 --with-atl-lib-dir=$WDK_HOME\lib\ATL\i386
185 --with-mfc-include-dir=$WDK_HOME\inc\mfc42
186 --with-mfc-lib-dir=$WDK_HOME\lib\Mfc\i386
175],,)
176
187],,)
188
189AC_ARG_WITH(atl-include-dir,
190[ --with-atl-include-dir Path to ATL include directory for windows build.
191 This switch is mandatory when using VC++ 2008 Express
192 and configuring with ATL/ActiveX enabled.
193 You can use the Windows Driver Kit (WDK) and
194 configure with the following switch:
195 --with-atl-include-dir=$WDK_HOME\inc\atl71
196],,)
197
198AC_ARG_WITH(atl-lib-dir,
199[ --with-atl-lib-dir Path to ATL libraries directory for windows build.
200 This switch is mandatory when using VC++ 2008 Express
201 and configuring with ATL/ActiveX enabled.
202 You can use the Windows Driver Kit (WDK) and
203 configure with the following switch:
204 --with-atl-lib-dir=$WDK_HOME\lib\ATL\i386
205],,)
206
207AC_ARG_WITH(mfc-include-dir,
208[ --with-mfc-include-dir Path to MFC include directory for windows build.
209 This switch is mandatory when using VC++ 2008 Express
210 and configuring with ATL/ActiveX enabled.
211 You can use the Windows Driver Kit (WDK) and
212 configure with the following switch:
213 --with-mfc-include-dir=$WDK_HOME\inc\mfc42
214],,)
215
216AC_ARG_WITH(mfc-lib-dir,
217[ --with-mfc-lib-dir Path to MFC libraries directory for windows build.
218 This switch is mandatory when using VC++ 2008 Express
219 and configuring with ATL/ActiveX enabled.
220 You can use the Windows Driver Kit (WDK) and
221 configure with the following switch:
222 --with-mfc-lib-dir=$WDK_HOME\lib\Mfc\i386
223],,)
224
225
177AC_ARG_ENABLE(symbols,
178[ --enable-symbols Include debugging symbols in output.
179 WARNING - a complete build needs 8 Gb of space and
180 takes much longer. (enables -g compiler flag)
181
182 --enable-symbols=SMALL sets the gcc -g1 setting
183 which is smaller.
184

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

5689 DIRECTXSDK_HOME=""
5690 AC_MSG_RESULT([disabled])
5691 fi
5692fi
5693AC_SUBST(ENABLE_DIRECT_DRAW)
5694AC_SUBST(DIRECTXSDK_HOME)
5695AC_SUBST(DIRECTXSDK_LIB)
5696
226AC_ARG_ENABLE(symbols,
227[ --enable-symbols Include debugging symbols in output.
228 WARNING - a complete build needs 8 Gb of space and
229 takes much longer. (enables -g compiler flag)
230
231 --enable-symbols=SMALL sets the gcc -g1 setting
232 which is smaller.
233

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

5738 DIRECTXSDK_HOME=""
5739 AC_MSG_RESULT([disabled])
5740 fi
5741fi
5742AC_SUBST(ENABLE_DIRECT_DRAW)
5743AC_SUBST(DIRECTXSDK_HOME)
5744AC_SUBST(DIRECTXSDK_LIB)
5745
5746
5697dnl ============================================
5747dnl ============================================
5748dnl Check for ATL and MFC
5749dnl ============================================
5750if test \( "$_os" = "WINNT" \) ; then
5751 AC_MSG_CHECKING([for ATL and MFC])
5752 if test "$DISABLE_ATL" = "TRUE" -o "$DISABLE_ACTIVEX" = "TRUE" ; then
5753 AC_MSG_RESULT([ATL/MFC disabled])
5754 else
5755 AC_MSG_NOTICE([testing ATL/MFC libs and includes])
5756 if test -z "$with_atl_include_dir"; then
5757 ATL_INCLUDE=$COMPATH/atlmfc/include
5758 else
5759 ATL_INCLUDE=`cygpath -u "$with_atl_include_dir"`
5760 fi
5761 if test -z "$with_atl_lib_dir"; then
5762 ATL_LIB=$COMPATH/atlmfc/lib
5763 else
5764 ATL_LIB=`cygpath -u "$with_atl_lib_dir"`
5765 fi
5766 if test -z "$with_mfc_include_dir"; then
5767 MFC_INCLUDE=$COMPATH/atlmfc/include
5768 else
5769 MFC_INCLUDE=`cygpath -u "$with_mfc_include_dir"`
5770 fi
5771 if test -z "$with_mfc_lib_dir"; then
5772 MFC_LIB=$COMPATH/atlmfc/lib
5773 else
5774 MFC_LIB=`cygpath -u "$with_mfc_lib_dir"`
5775 fi
5776
5777 ATL_INCLUDE=`echo $ATL_INCLUDE | $SED 's/\/$//'`
5778 ATL_LIB=`echo $ATL_LIB | $SED 's/\/$//'`
5779 MFC_INCLUDE=`echo $MFC_INCLUDE | $SED 's/\/$//'`
5780 MFC_LIB=`echo $MFC_LIB | $SED 's/\/$//'`
5781
5782 if test -f "$ATL_INCLUDE/atlase.h"; then
5783 HAVE_ATL_H="yes"
5784 else
5785 HAVA_ATL_H="no"
5786 fi
5787 if test -f "$MFC_INCLUDE/afx.h"; then
5788 HAVE_MFC_H="yes"
5789 else
5790 HAVA_MFC_H="no"
5791 fi
5792 if test -f "$ATL_LIB/atls.lib"; then
5793 HAVE_ATL_LIB="yes"
5794 if test -f "$ATL_LIB/atlthunk.lib"; then
5795 HAVE_ATLTHUNK="YES"
5796 else
5797 HAVE_ATLTHUNK="NO"
5798 fi
5799 else
5800 HAVE_ATL_LIB="no"
5801 fi
5802
5803 dnl TODO check also MFC libraries, they seem to have diferent names
5804 dnl mfc42.lib mfc90.lib
5805 if test -d "$MFC_LIB"; then
5806 HAVE_MFC_LIB="yes"
5807 else
5808 HAVE_MFC_LIB="no"
5809 fi
5810
5811 if test "$HAVE_ATL_H" = "no" -o "$HAVE_MFC_H" = "no" -o "$HAVE_ATL_LIB" = "no" -o "$HAVE_MFC_LIB" = "no"; then
5812 ATL_INCLUDE=
5813 ATL_LIB=
5814 MFC_INCLUDE=
5815 MFC_LIB=
5816 HAVE_ATL_LIB=
5817 dnl TODO shouldn't this be an error?
5818 DISABLE_ACTIVEX="TRUE"
5819 DISABLE_ATL="TRUE"
5820 AC_MSG_RESULT([ATL/MFC disabled])
5821 else
5822 ATL_INCLUDE=`cygpath -dm "$ATL_INCLUDE"`
5823 ATL_LIB=`cygpath -dm "$ATL_LIB"`
5824 MFC_INCLUDE=`cygpath -dm "$MFC_INCLUDE"`
5825 MFC_LIB=`cygpath -dm "$MFC_LIB"`
5826 AC_MSG_RESULT([ATL/MFC enabled])
5827 fi
5828 fi
5829fi
5830AC_SUBST(ATL_INCLUDE)
5831AC_SUBST(ATL_LIB)
5832AC_SUBST(HAVE_ATLTHUNK)
5833AC_SUBST(MFC_INCLUDE)
5834AC_SUBST(MFC_LIB)
5835
5836
5837dnl ============================================
5698dnl Check for Nullsoft Scriptable Install System
5699dnl ============================================
5700NSIS_PATH=""
5701if test "$_os" = "WINNT" ; then
5702 AC_MSG_CHECKING([for NSIS])
5703 AC_PATH_PROG(NSIS_PATH, nsis.exe)
5704 if test -n "$NSIS_PATH"; then
5705 NSIS_PATH=`dirname "$NSIS_PATH"`

--- 1836 unchanged lines hidden --- 		5838dnl Check for Nullsoft Scriptable Install System
5839dnl ============================================
5840NSIS_PATH=""
5841if test "$_os" = "WINNT" ; then
5842 AC_MSG_CHECKING([for NSIS])
5843 AC_PATH_PROG(NSIS_PATH, nsis.exe)
5844 if test -n "$NSIS_PATH"; then
5845 NSIS_PATH=`dirname "$NSIS_PATH"`

--- 1836 unchanged lines hidden ---