| configure.ac (f0157b90) | configure.ac (ad35682b) |
|---|---|
| 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 --- 849 unchanged lines hidden (view full) --- 858 Usage: --with-unix-wrapper=ooffice 859],,) 860AC_ARG_WITH(asm-home, 861[ --with-asm-home For Windows users, please supply the path for the 862 ml.exe assembler. 863 864 Usage: --with-asm-home=<path to ml.exe directory> 865],,) | 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 --- 849 unchanged lines hidden (view full) --- 858 Usage: --with-unix-wrapper=ooffice 859],,) 860AC_ARG_WITH(asm-home, 861[ --with-asm-home For Windows users, please supply the path for the 862 ml.exe assembler. 863 864 Usage: --with-asm-home=<path to ml.exe directory> 865],,) |
| 866AC_ARG_WITH(nasm-home, 867[ --with-nasm-home For Windows users, please supply the path for the 868 nasm.exe assembler. 869 870 Usage: --with-nasm-home=<path to nasm.exe directory> 871],,) |
|
| 866AC_ARG_WITH(os-version, 867[ --with-os-version For FreeBSD users, use this option option to override 868 the detected OSVERSION. 869 870 Usage: --with-os-version=<OSVERSION> 871],,) 872AC_ARG_WITH(unzip-home, 873[ --with-unzip-home Deprecated: use --with-zip-home instead],,) --- 4668 unchanged lines hidden (view full) --- 5542 fi 5543 AC_MSG_RESULT([$ASM_HOME]) 5544else 5545 with_asm_home="NO_ASM_HOME" 5546fi 5547ASM_HOME="$with_asm_home" 5548AC_SUBST(ASM_HOME) 5549 | 872AC_ARG_WITH(os-version, 873[ --with-os-version For FreeBSD users, use this option option to override 874 the detected OSVERSION. 875 876 Usage: --with-os-version=<OSVERSION> 877],,) 878AC_ARG_WITH(unzip-home, 879[ --with-unzip-home Deprecated: use --with-zip-home instead],,) --- 4668 unchanged lines hidden (view full) --- 5548 fi 5549 AC_MSG_RESULT([$ASM_HOME]) 5550else 5551 with_asm_home="NO_ASM_HOME" 5552fi 5553ASM_HOME="$with_asm_home" 5554AC_SUBST(ASM_HOME) 5555 |
| 5556dnl *************************************** 5557dnl testing nasm.exe assembler path 5558dnl *************************************** 5559if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes" -a "$SYSTEM_OPENSSL" = "NO"; then 5560 AC_MSG_CHECKING([nasm.exe assembler path]) 5561 if test -n "$with_nasm_home"; then 5562 with_nasm_home=`cygpath -u "$with_nasm_home"` 5563 fi 5564 if test ! -x "$with_nasm_home/nasm.exe"; then 5565 AC_PATH_PROG(NASM_EXE, nasm.exe) 5566 if test -z "$NASM_EXE"; then 5567 with_nasm_home="NO_NASM_HOME" 5568 else 5569 with_nasm_home="NASM_IN_PATH" 5570 fi 5571 fi 5572 AC_MSG_RESULT([$NASM_HOME]) 5573else 5574 with_nasm_home="NO_NASM_HOME" 5575fi 5576NASM_HOME="$with_nasm_home" 5577AC_SUBST(NASM_HOME) 5578 |
|
| 5550dnl =================================================================== 5551dnl testing handle deprecated unzip switch 5552dnl =================================================================== 5553if test -z "$with_zip_home"; then 5554 with_zip_home="$with_unzip_home" 5555fi 5556dnl =================================================================== 5557dnl Zip will be found where you tell me to find it --- 1676 unchanged lines hidden --- | 5579dnl =================================================================== 5580dnl testing handle deprecated unzip switch 5581dnl =================================================================== 5582if test -z "$with_zip_home"; then 5583 with_zip_home="$with_unzip_home" 5584fi 5585dnl =================================================================== 5586dnl Zip will be found where you tell me to find it --- 1676 unchanged lines hidden --- |