Skip to content
This repository
Browse code

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
Mike Lundy novas0x2a authored

Showing 3 changed files with 6 additions and 10 deletions. Show diff stats Hide diff stats

  1. +1 1  configure.ac
  2. +4 8 m4/ax_common_options.m4
  3. +1 1  m4/ax_pkg.m4
2  configure.ac
@@ -30,7 +30,7 @@ AC_INIT([NASA Ames Stereo Pipeline], [2.1], [asp@nx.arc.nasa.gov], [StereoPipeli
30 30 AC_CONFIG_AUX_DIR(config)
31 31 AC_CONFIG_MACRO_DIR([m4])
32 32 AC_CANONICAL_HOST
33   -AM_INIT_AUTOMAKE
  33 +AM_INIT_AUTOMAKE([nostdinc])
34 34 AX_CONFIG_HEADER_PREFIX([src/asp_config.h], [ASP_])
35 35
36 36 dnl TODO BEFORE RELEASE: update libtool version
12 m4/ax_common_options.m4
... ... @@ -1,11 +1,5 @@
1 1 AC_DEFUN([AX_COMMON_OPTIONS], [
2 2
3   -# We set up the include paths ourselves, so we ask autoconf to get out of the way
4   -DEFAULT_INCLUDES=
5   -AC_SUBST(DEFAULT_INCLUDES)
6   -
7   -
8   -
9 3 ##################################################
10 4 # Compilation options
11 5 ##################################################
@@ -15,6 +9,8 @@ AX_ARG_ENABLE(debug, no, [none], [generate debugging symbols]
15 9 AX_ARG_ENABLE(optimize, 3, [none], [compiler optimization level])
16 10 AX_ARG_ENABLE(lib64, auto, [none], [force /lib64 instead of /lib])
17 11
  12 +
  13 +
18 14 ##################################################
19 15 # Handle options
20 16 ##################################################
@@ -57,8 +53,8 @@ esac
57 53 case "$ENABLE_OPTIMIZE" in
58 54 yes) AX_CFLAGS="$AX_CFLAGS -O3" ;;
59 55 3|2|1) AX_CFLAGS="$AX_CFLAGS -O$ENABLE_OPTIMIZE" ;;
60   - coreduo) AX_CFLAGS="$AX_CFLAGS -O4 -march=prescott -mtune=prescott -funroll-loops -msse -msse2 -msse3 -mfpmath=sse" ;;
61   - sse3) AX_CFLAGS="$AX_CFLAGS -O4 -funroll-loops -msse -msse2 -msse3 -mfpmath=sse" ;;
  56 + coreduo) AX_CFLAGS="$AX_CFLAGS -O4 -march=prescott -mtune=prescott -funroll-loops -msse -msse2 -msse3 -mfpmath=sse -ftree-vectorize" ;;
  57 + sse3) AX_CFLAGS="$AX_CFLAGS -O4 -funroll-loops -msse -msse2 -msse3 -mfpmath=sse -ftree-vectorize" ;;
62 58 no|0) AC_MSG_WARN([*** The Vision Workbench may not work properly with optimization disabled! ***])
63 59 AX_CFLAGS="$AX_CFLAGS -O0" ;;
64 60 *) AC_MSG_ERROR([Unknown optimize option: "$ENABLE_OPTIMIZE"]) ;;
2  m4/ax_pkg.m4
@@ -70,7 +70,7 @@ AC_DEFUN([AX_PKG],
70 70 elif test -n "${HAVE_PKG_$1}" && test "${HAVE_PKG_$1}" != "yes" && test "${HAVE_PKG_$1}" != "no"; then
71 71 PKG_PATHS_$1=${HAVE_PKG_$1}
72 72 else
73   - PKG_PATHS_$1="${PKG_PATHS} default"
  73 + PKG_PATHS_$1="default ${PKG_PATHS}"
74 74 fi
75 75
76 76 HAVE_PKG_$1=no

0 comments on commit c806fb3

Please sign in to comment.
Something went wrong with that request. Please try again.