Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

revert putting the system path last

okay, so this is annoying. there's really no way to detect whether
we found something in the system path or not. We can't use something like
-nostdinc without making things really hard.

The only safe thing to do to use a non-standard path when a pkg is in your
standard path is to pass --with-pkg and be sure it's actually there.
  • Loading branch information...
commit c806fb397e91cc57e8b40311ec9d3d767434a15a 1 parent 6aab8d2
@novas0x2a novas0x2a authored
Showing with 6 additions and 10 deletions.
  1. +1 −1  configure.ac
  2. +4 −8 m4/ax_common_options.m4
  3. +1 −1  m4/ax_pkg.m4
View
2  configure.ac
@@ -30,7 +30,7 @@ AC_INIT([NASA Ames Stereo Pipeline], [2.1], [asp@nx.arc.nasa.gov], [StereoPipeli
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([nostdinc])
AX_CONFIG_HEADER_PREFIX([src/asp_config.h], [ASP_])
dnl TODO BEFORE RELEASE: update libtool version
View
12 m4/ax_common_options.m4
@@ -1,11 +1,5 @@
AC_DEFUN([AX_COMMON_OPTIONS], [
-# We set up the include paths ourselves, so we ask autoconf to get out of the way
-DEFAULT_INCLUDES=
-AC_SUBST(DEFAULT_INCLUDES)
-
-
-
##################################################
# Compilation options
##################################################
@@ -15,6 +9,8 @@ AX_ARG_ENABLE(debug, no, [none], [generate debugging symbols]
AX_ARG_ENABLE(optimize, 3, [none], [compiler optimization level])
AX_ARG_ENABLE(lib64, auto, [none], [force /lib64 instead of /lib])
+
+
##################################################
# Handle options
##################################################
@@ -57,8 +53,8 @@ esac
case "$ENABLE_OPTIMIZE" in
yes) AX_CFLAGS="$AX_CFLAGS -O3" ;;
3|2|1) AX_CFLAGS="$AX_CFLAGS -O$ENABLE_OPTIMIZE" ;;
- coreduo) AX_CFLAGS="$AX_CFLAGS -O4 -march=prescott -mtune=prescott -funroll-loops -msse -msse2 -msse3 -mfpmath=sse" ;;
- sse3) AX_CFLAGS="$AX_CFLAGS -O4 -funroll-loops -msse -msse2 -msse3 -mfpmath=sse" ;;
+ coreduo) AX_CFLAGS="$AX_CFLAGS -O4 -march=prescott -mtune=prescott -funroll-loops -msse -msse2 -msse3 -mfpmath=sse -ftree-vectorize" ;;
+ sse3) AX_CFLAGS="$AX_CFLAGS -O4 -funroll-loops -msse -msse2 -msse3 -mfpmath=sse -ftree-vectorize" ;;
no|0) AC_MSG_WARN([*** The Vision Workbench may not work properly with optimization disabled! ***])
AX_CFLAGS="$AX_CFLAGS -O0" ;;
*) AC_MSG_ERROR([Unknown optimize option: "$ENABLE_OPTIMIZE"]) ;;
View
2  m4/ax_pkg.m4
@@ -70,7 +70,7 @@ AC_DEFUN([AX_PKG],
elif test -n "${HAVE_PKG_$1}" && test "${HAVE_PKG_$1}" != "yes" && test "${HAVE_PKG_$1}" != "no"; then
PKG_PATHS_$1=${HAVE_PKG_$1}
else
- PKG_PATHS_$1="${PKG_PATHS} default"
+ PKG_PATHS_$1="default ${PKG_PATHS}"
fi
HAVE_PKG_$1=no
Please sign in to comment.
Something went wrong with that request. Please try again.