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