Changeset 1718


Ignore:
Timestamp:
Jul 1, 2007, 10:55:34 PM (8 years ago)
Author:
chris
Message:

Remove --with-bdb-dir option, to avoid confusion and be consistent with the
SSL flags. (merges [1717] by James O'Gorman)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • box/chris/general/infrastructure/m4/ax_path_bdb.m4

    r1716 r1718  
    1313dnl BDB_VERSION to the version found. HAVE_DB_H is defined also.
    1414dnl
    15 dnl The option --with-bdb-dir=DIR can be used to specify a specific
    16 dnl Berkeley DB installation to use, or --with-bdb-headers=DIR and
    17 dnl --with-bdb-lib=DIR can be used to specify individual include and
    18 dnl library locations.
    19 dnl
    20 dnl An example of it's use is:
     15dnl The options --with-bdb-headers=DIR and --with-bdb-lib=DIR can be
     16dnl used to specify a specific Berkeley DB installation to use.
     17dnl
     18dnl An example of its use is:
    2119dnl
    2220dnl    AX_PATH_BDB([3],[
     
    7371  ax_path_bdb_ok=no
    7472
    75   # Add --with-bdb-dir option to configure.
    76   AC_ARG_WITH([bdb-dir],
    77     [AC_HELP_STRING([--with-bdb-dir=DIR],
    78                     [Berkeley DB installation directory])])
    79 
    8073  # Add --with-bdb-headers and --with-bdb-lib options
    8174  AC_ARG_WITH([bdb-headers],
     
    8881 
    8982  # Check if --with-bdb-dir was specified.
    90   if test "x$with_bdb_dir" = "x" -a \
    91      "x$with_bdb_headers" = "x" -a "x$with_bdb_lib" = "x"; then
     83  if test "x$with_bdb_headers" = "x" -a "x$with_bdb_lib" = "x"; then
    9284    # No option specified, so just search the system.
    9385    AX_PATH_BDB_NO_OPTIONS([$1], [HIGHEST], [
     
    9587    ])
    9688   else
    97      # Check if the --with-bdb-headers and --with-bdb-lib flags were defined
    98      # Use them if so, otherwise use --with-bdb-dir
    99      if test "x$with_bdb_headers" = "x"; then
    100        ax_path_bdb_INC="$with_bdb_dir/include"
    101      else
    102        ax_path_bdb_INC="$with_bdb_headers"
    103      fi
    104      if test "x$with_bdb_lib" = "x"; then
    105        ax_path_bdb_LIB="$with_bdb_dir/lib"
    106      else
    107        ax_path_bdb_LIB="$with_bdb_lib"
    108      fi
     89     ax_path_bdb_INC="$with_bdb_headers"
     90     ax_path_bdb_LIB="$with_bdb_lib"
    10991
    11092     dnl # Save previous environment, and modify with new stuff.
Note: See TracChangeset for help on using the changeset viewer.