Author: truckman
Date: Sat Aug 27 05:56:13 2016
New Revision: 1757950
URL: http://svn.apache.org/viewvc?rev=1757950&view=rev
Log:
Restore the --with-nasm-home code added to configure by r1756954
that was inadvertently deleted by r1757861.
Modified:
openoffice/trunk/main/configure.ac
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1757950&r1=1757949&r2=1757950&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Sat Aug 27 05:56:13 2016
@@ -863,6 +863,12 @@ AC_ARG_WITH(asm-home,
Usage: --with-asm-home=<path to ml.exe directory>
],,)
+AC_ARG_WITH(nasm-home,
+[ --with-nasm-home For Windows users, please supply the path for the
+ nasm.exe assembler.
+
+ Usage: --with-nasm-home=<path to nasm.exe directory>
+],,)
AC_ARG_WITH(os-version,
[ --with-os-version For FreeBSD users, use this option option to
override
the detected OSVERSION.
@@ -5547,6 +5553,29 @@ fi
ASM_HOME="$with_asm_home"
AC_SUBST(ASM_HOME)
+dnl ***************************************
+dnl testing nasm.exe assembler path
+dnl ***************************************
+if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes" -a "$SYSTEM_OPENSSL" =
"NO"; then
+ AC_MSG_CHECKING([nasm.exe assembler path])
+ if test -n "$with_nasm_home"; then
+ with_nasm_home=`cygpath -u "$with_nasm_home"`
+ fi
+ if test ! -x "$with_nasm_home/nasm.exe"; then
+ AC_PATH_PROG(NASM_EXE, nasm.exe)
+ if test -z "$NASM_EXE"; then
+ with_nasm_home="NO_NASM_HOME"
+ else
+ with_nasm_home="NASM_IN_PATH"
+ fi
+ fi
+ AC_MSG_RESULT([$NASM_HOME])
+else
+ with_nasm_home="NO_NASM_HOME"
+fi
+NASM_HOME="$with_nasm_home"
+AC_SUBST(NASM_HOME)
+
dnl ===================================================================
dnl testing handle deprecated unzip switch
dnl ===================================================================
