| configure.ac (1706e35b) | configure.ac (0fd36615) |
|---|---|
| 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 --- 1515 unchanged lines hidden (view full) --- 1524 AC_MSG_CHECKING([whether to use ActiveX]) 1525 if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then 1526 DISABLE_ACTIVEX="" 1527 AC_MSG_RESULT([yes]) 1528 else 1529 DISABLE_ACTIVEX="TRUE" 1530 AC_MSG_RESULT([no]) 1531 fi | 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 --- 1515 unchanged lines hidden (view full) --- 1524 AC_MSG_CHECKING([whether to use ActiveX]) 1525 if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then 1526 DISABLE_ACTIVEX="" 1527 AC_MSG_RESULT([yes]) 1528 else 1529 DISABLE_ACTIVEX="TRUE" 1530 AC_MSG_RESULT([no]) 1531 fi |
| 1532 AC_SUBST(DISABLE_ACTIVEX) | |
| 1533 1534 AC_MSG_CHECKING([whether to use ATL]) 1535 if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then 1536 DISABLE_ATL="" 1537 AC_MSG_RESULT([yes]) 1538 else 1539 DISABLE_ATL="TRUE" | 1532 1533 AC_MSG_CHECKING([whether to use ATL]) 1534 if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then 1535 DISABLE_ATL="" 1536 AC_MSG_RESULT([yes]) 1537 else 1538 DISABLE_ATL="TRUE" |
| 1539 dnl ActiveX depends on ATL, it should be disabled 1540 DISABLE_ACTIVEX="TRUE" |
|
| 1540 AC_MSG_RESULT([no]) 1541 fi | 1541 AC_MSG_RESULT([no]) 1542 fi |
| 1543 |
|
| 1542 AC_SUBST(DISABLE_ATL) | 1544 AC_SUBST(DISABLE_ATL) |
| 1545 AC_SUBST(DISABLE_ACTIVEX) |
|
| 1543 1544fi 1545 1546dnl =================================================================== 1547dnl Disable rpath in shared libraries? 1548dnl =================================================================== 1549AC_MSG_CHECKING([whether to use RPATH in shared libraries]) 1550if test "$enable_rpath" = "no"; then --- 4193 unchanged lines hidden (view full) --- 5744AC_SUBST(DIRECTXSDK_LIB) 5745 5746 5747dnl ============================================ 5748dnl Check for ATL and MFC 5749dnl ============================================ 5750if test \( "$_os" = "WINNT" \) ; then 5751 AC_MSG_CHECKING([for ATL and MFC]) | 1546 1547fi 1548 1549dnl =================================================================== 1550dnl Disable rpath in shared libraries? 1551dnl =================================================================== 1552AC_MSG_CHECKING([whether to use RPATH in shared libraries]) 1553if test "$enable_rpath" = "no"; then --- 4193 unchanged lines hidden (view full) --- 5747AC_SUBST(DIRECTXSDK_LIB) 5748 5749 5750dnl ============================================ 5751dnl Check for ATL and MFC 5752dnl ============================================ 5753if test \( "$_os" = "WINNT" \) ; then 5754 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]) | 5755 if test "$DISABLE_ATL" = "TRUE"; then 5756 AC_MSG_RESULT([ATL is disabled, nothing to check]) |
| 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 --- 1946 unchanged lines hidden --- | 5757 else 5758 AC_MSG_NOTICE([testing ATL/MFC libs and includes]) 5759 if test -z "$with_atl_include_dir"; then 5760 ATL_INCLUDE=$COMPATH/atlmfc/include 5761 else 5762 ATL_INCLUDE=`cygpath -u "$with_atl_include_dir"` 5763 fi 5764 if test -z "$with_atl_lib_dir"; then --- 1946 unchanged lines hidden --- |