configure.ac (ca7d9e04) configure.ac (33605542)
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

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

263[ --enable-crashdump Enable the crashdump feature code.
264],,)
265AC_ARG_ENABLE(cl-standard,
266[ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing
267 standard compiler. ( This just disables optimization
268 options and therefore removes a lot of warnings when
269 using the cheaper standard compiler. )
270],,)
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

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

263[ --enable-crashdump Enable the crashdump feature code.
264],,)
265AC_ARG_ENABLE(cl-standard,
266[ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing
267 standard compiler. ( This just disables optimization
268 options and therefore removes a lot of warnings when
269 using the cheaper standard compiler. )
270],,)
271AC_ARG_ENABLE(win-x64-shellext,
272[ --enable-win-x64-shellext Enable the build/usage of Windows 64bit shell extensions.
273 These extension are used for the system integration on a
274 Windows 64bit systems. For example supporting the search
275 in ODF files with the standard Windows search feature.
276],,)
271AC_ARG_ENABLE(gtk,
272[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
273 where Gtk+ is available.
274],,enable_gtk=yes)
275AC_ARG_ENABLE(gstreamer,
276[ --enable-gstreamer Determines whether to use the GStreamer media
277 backend on platforms where GStreamer is available.
278],,enable_gstreamer=no)

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

1287 AC_MSG_RESULT([no])
1288 else
1289 VC_STANDARD="TRUE"
1290 AC_MSG_RESULT([yes])
1291 fi
1292 AC_SUBST(VC_STANDARD)
1293fi
1294
277AC_ARG_ENABLE(gtk,
278[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
279 where Gtk+ is available.
280],,enable_gtk=yes)
281AC_ARG_ENABLE(gstreamer,
282[ --enable-gstreamer Determines whether to use the GStreamer media
283 backend on platforms where GStreamer is available.
284],,enable_gstreamer=no)

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

1293 AC_MSG_RESULT([no])
1294 else
1295 VC_STANDARD="TRUE"
1296 AC_MSG_RESULT([yes])
1297 fi
1298 AC_SUBST(VC_STANDARD)
1299fi
1300
1301if test "$_os" = "WINNT"; then
1302 dnl ===================================================================
1303 dnl Set the BUILD_X64 variable.
1304 dnl ===================================================================
1305 AC_MSG_CHECKING([whether to build/use the Windows 64bit shell extensions])
1306 if test "$enable_win_x64_shellext" = "" -o "$enable_win_x64_shellext" = "no"; then
1307 BUILD_X64=""
1308 AC_MSG_RESULT([no])
1309 else
1310 BUILD_X64="TRUE"
1311 AC_MSG_RESULT([yes])
1312 fi
1313 AC_SUBST(BUILD_X64)
1314fi
1315
1295dnl ===================================================================
1296dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
1297dnl ===================================================================
1298AC_MSG_CHECKING([whether to turn warnings to errors])
1299if test -n "$enable_werror" && test "$enable_werror" != "no"; then
1300 ENABLE_WERROR="TRUE"
1301 AC_MSG_RESULT([yes])
1302 AC_MSG_WARN([Turning warnings to errors has no effect in modules or])

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

5761 AC_MSG_NOTICE([testing ATL/MFC libs and includes])
5762 if test -z "$with_atl_include_dir"; then
5763 ATL_INCLUDE=$COMPATH/atlmfc/include
5764 else
5765 ATL_INCLUDE=`cygpath -u "$with_atl_include_dir"`
5766 fi
5767 if test -z "$with_atl_lib_dir"; then
5768 ATL_LIB=$COMPATH/atlmfc/lib
1316dnl ===================================================================
1317dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
1318dnl ===================================================================
1319AC_MSG_CHECKING([whether to turn warnings to errors])
1320if test -n "$enable_werror" && test "$enable_werror" != "no"; then
1321 ENABLE_WERROR="TRUE"
1322 AC_MSG_RESULT([yes])
1323 AC_MSG_WARN([Turning warnings to errors has no effect in modules or])

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

5782 AC_MSG_NOTICE([testing ATL/MFC libs and includes])
5783 if test -z "$with_atl_include_dir"; then
5784 ATL_INCLUDE=$COMPATH/atlmfc/include
5785 else
5786 ATL_INCLUDE=`cygpath -u "$with_atl_include_dir"`
5787 fi
5788 if test -z "$with_atl_lib_dir"; then
5789 ATL_LIB=$COMPATH/atlmfc/lib
5790 ATL_LIB_X64=$COMPATH/atlmfc/lib/amd64
5769 else
5770 ATL_LIB=`cygpath -u "$with_atl_lib_dir"`
5791 else
5792 ATL_LIB=`cygpath -u "$with_atl_lib_dir"`
5793 ATL_LIB_X64=$ATL_LIB/../amd64
5771 fi
5772 if test -z "$with_mfc_include_dir"; then
5773 MFC_INCLUDE=$COMPATH/atlmfc/include
5774 else
5775 MFC_INCLUDE=`cygpath -u "$with_mfc_include_dir"`
5776 fi
5777 if test -z "$with_mfc_lib_dir"; then
5778 MFC_LIB=$COMPATH/atlmfc/lib
5779 else
5780 MFC_LIB=`cygpath -u "$with_mfc_lib_dir"`
5781 fi
5782
5783 ATL_INCLUDE=`echo $ATL_INCLUDE | $SED 's/\/$//'`
5784 ATL_LIB=`echo $ATL_LIB | $SED 's/\/$//'`
5794 fi
5795 if test -z "$with_mfc_include_dir"; then
5796 MFC_INCLUDE=$COMPATH/atlmfc/include
5797 else
5798 MFC_INCLUDE=`cygpath -u "$with_mfc_include_dir"`
5799 fi
5800 if test -z "$with_mfc_lib_dir"; then
5801 MFC_LIB=$COMPATH/atlmfc/lib
5802 else
5803 MFC_LIB=`cygpath -u "$with_mfc_lib_dir"`
5804 fi
5805
5806 ATL_INCLUDE=`echo $ATL_INCLUDE | $SED 's/\/$//'`
5807 ATL_LIB=`echo $ATL_LIB | $SED 's/\/$//'`
5808 ATL_LIB_X64=`echo $ATL_LIB_X64 | $SED 's/\/$//'`
5785 MFC_INCLUDE=`echo $MFC_INCLUDE | $SED 's/\/$//'`
5786 MFC_LIB=`echo $MFC_LIB | $SED 's/\/$//'`
5787
5788 AC_MSG_NOTICE([looking for atlbase.h in "$ATL_INCLUDE"])
5789 if test -f "$ATL_INCLUDE/atlbase.h"; then
5790 HAVE_ATL_H="yes"
5791 else
5792 HAVE_ATL_H="no"

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

5822 HAVE_MFC_LIB="yes"
5823 else
5824 HAVE_MFC_LIB="no"
5825 fi
5826
5827 if test "$HAVE_ATL_H" = "no" -o "$HAVE_MFC_H" = "no" -o "$HAVE_ATL_LIB" = "no" -o "$HAVE_MFC_LIB" = "no"; then
5828 ATL_INCLUDE=
5829 ATL_LIB=
5809 MFC_INCLUDE=`echo $MFC_INCLUDE | $SED 's/\/$//'`
5810 MFC_LIB=`echo $MFC_LIB | $SED 's/\/$//'`
5811
5812 AC_MSG_NOTICE([looking for atlbase.h in "$ATL_INCLUDE"])
5813 if test -f "$ATL_INCLUDE/atlbase.h"; then
5814 HAVE_ATL_H="yes"
5815 else
5816 HAVE_ATL_H="no"

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

5846 HAVE_MFC_LIB="yes"
5847 else
5848 HAVE_MFC_LIB="no"
5849 fi
5850
5851 if test "$HAVE_ATL_H" = "no" -o "$HAVE_MFC_H" = "no" -o "$HAVE_ATL_LIB" = "no" -o "$HAVE_MFC_LIB" = "no"; then
5852 ATL_INCLUDE=
5853 ATL_LIB=
5854 ATL_LIB_X64=
5830 MFC_INCLUDE=
5831 MFC_LIB=
5832 HAVE_ATL_LIB=
5833 dnl TODO shouldn't this be an error?
5834 DISABLE_ACTIVEX="TRUE"
5835 DISABLE_ATL="TRUE"
5836 AC_MSG_RESULT([ATL/MFC disabled])
5837 else
5838 ATL_INCLUDE=`cygpath -dm "$ATL_INCLUDE"`
5839 ATL_LIB=`cygpath -dm "$ATL_LIB"`
5855 MFC_INCLUDE=
5856 MFC_LIB=
5857 HAVE_ATL_LIB=
5858 dnl TODO shouldn't this be an error?
5859 DISABLE_ACTIVEX="TRUE"
5860 DISABLE_ATL="TRUE"
5861 AC_MSG_RESULT([ATL/MFC disabled])
5862 else
5863 ATL_INCLUDE=`cygpath -dm "$ATL_INCLUDE"`
5864 ATL_LIB=`cygpath -dm "$ATL_LIB"`
5865 ATL_LIB_X64=`cygpath -dm "$ATL_LIB_X64"`
5840 MFC_INCLUDE=`cygpath -dm "$MFC_INCLUDE"`
5841 MFC_LIB=`cygpath -dm "$MFC_LIB"`
5842 AC_MSG_RESULT([ATL/MFC enabled])
5843 fi
5844 fi
5845fi
5846AC_SUBST(ATL_INCLUDE)
5847AC_SUBST(ATL_LIB)
5866 MFC_INCLUDE=`cygpath -dm "$MFC_INCLUDE"`
5867 MFC_LIB=`cygpath -dm "$MFC_LIB"`
5868 AC_MSG_RESULT([ATL/MFC enabled])
5869 fi
5870 fi
5871fi
5872AC_SUBST(ATL_INCLUDE)
5873AC_SUBST(ATL_LIB)
5874AC_SUBST(ATL_LIB_X64)
5848AC_SUBST(HAVE_ATLTHUNK)
5849AC_SUBST(MFC_INCLUDE)
5850AC_SUBST(MFC_LIB)
5851
5852
5853dnl ============================================
5854dnl Check for Nullsoft Scriptable Install System
5855dnl ============================================

--- 1858 unchanged lines hidden ---
5875AC_SUBST(HAVE_ATLTHUNK)
5876AC_SUBST(MFC_INCLUDE)
5877AC_SUBST(MFC_LIB)
5878
5879
5880dnl ============================================
5881dnl Check for Nullsoft Scriptable Install System
5882dnl ============================================

--- 1858 unchanged lines hidden ---