View | Details | Raw Unified | Return to bug 56866
Collapse All | Expand All

(-)build/dbd.m4 (-8 / +8 lines)
Lines 31-37 Link Here
31
  AC_ARG_WITH([pgsql], APR_HELP_STRING([--with-pgsql=DIR], [specify PostgreSQL location]),
31
  AC_ARG_WITH([pgsql], APR_HELP_STRING([--with-pgsql=DIR], [specify PostgreSQL location]),
32
  [
32
  [
33
    if test "$withval" = "yes"; then
33
    if test "$withval" = "yes"; then
34
      AC_PATH_PROG([PGSQL_CONFIG],[pg_config])
34
      AC_PATH_TOOl([PGSQL_CONFIG],[pg_config])
35
      if test "x$PGSQL_CONFIG" != 'x'; then
35
      if test "x$PGSQL_CONFIG" != 'x'; then
36
        pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
36
        pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
37
        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
37
        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
Lines 68-74 Link Here
68
    elif test "$withval" = "no"; then
68
    elif test "$withval" = "no"; then
69
      :
69
      :
70
    else
70
    else
71
      AC_PATH_PROG([PGSQL_CONFIG],[pg_config],,[$withval/bin])
71
      AC_PATH_TOOL([PGSQL_CONFIG],[pg_config],,[$withval/bin])
72
      if test "x$PGSQL_CONFIG" != 'x'; then
72
      if test "x$PGSQL_CONFIG" != 'x'; then
73
        pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
73
        pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
74
        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
74
        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
Lines 108-114 Link Here
108
      fi
108
      fi
109
    fi
109
    fi
110
  ], [
110
  ], [
111
    AC_PATH_PROG([PGSQL_CONFIG],[pg_config])
111
    AC_PATH_TOOL([PGSQL_CONFIG],[pg_config])
112
    if test "x$PGSQL_CONFIG" != 'x'; then
112
    if test "x$PGSQL_CONFIG" != 'x'; then
113
      pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
113
      pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
114
      pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
114
      pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
Lines 166-172 Link Here
166
  AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
166
  AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
167
  [
167
  [
168
    if test "$withval" = "yes"; then
168
    if test "$withval" = "yes"; then
169
      AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
169
      AC_PATH_TOOL([MYSQL_CONFIG],[mysql_config])
170
      if test "x$MYSQL_CONFIG" != 'x'; then
170
      if test "x$MYSQL_CONFIG" != 'x'; then
171
        mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
171
        mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
172
        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
172
        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
Lines 192-198 Link Here
192
    elif test "$withval" = "no"; then
192
    elif test "$withval" = "no"; then
193
      :
193
      :
194
    else
194
    else
195
      AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin])
195
      AC_PATH_TOOL([MYSQL_CONFIG],[mysql_config],,[$withval/bin])
196
      if test "x$MYSQL_CONFIG" != 'x'; then
196
      if test "x$MYSQL_CONFIG" != 'x'; then
197
        mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
197
        mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
198
        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
198
        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
Lines 420-426 Link Here
420
  AC_ARG_WITH([odbc], APR_HELP_STRING([--with-odbc=DIR], [specify ODBC location]),
420
  AC_ARG_WITH([odbc], APR_HELP_STRING([--with-odbc=DIR], [specify ODBC location]),
421
  [
421
  [
422
    if test "$withval" = "yes"; then
422
    if test "$withval" = "yes"; then
423
      AC_PATH_PROG([ODBC_CONFIG],[odbc_config])
423
      AC_PATH_TOOL([ODBC_CONFIG],[odbc_config])
424
      if test "x$ODBC_CONFIG" != 'x'; then
424
      if test "x$ODBC_CONFIG" != 'x'; then
425
        odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`"
425
        odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`"
426
        odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`"
426
        odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`"
Lines 441-447 Link Here
441
    elif test "$withval" = "no"; then
441
    elif test "$withval" = "no"; then
442
      :
442
      :
443
    else
443
    else
444
      AC_PATH_PROG([ODBC_CONFIG],[odbc_config],,[$withval/bin])
444
      AC_PATH_TOOL([ODBC_CONFIG],[odbc_config],,[$withval/bin])
445
      if test "x$ODBC_CONFIG" != 'x'; then
445
      if test "x$ODBC_CONFIG" != 'x'; then
446
        odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`"
446
        odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`"
447
        odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`"
447
        odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`"
Lines 471-477 Link Here
471
      fi
471
      fi
472
    fi
472
    fi
473
  ], [
473
  ], [
474
    AC_PATH_PROG([ODBC_CONFIG],[odbc_config])
474
    AC_PATH_TOOL([ODBC_CONFIG],[odbc_config])
475
    if test "x$ODBC_CONFIG" != 'x'; then
475
    if test "x$ODBC_CONFIG" != 'x'; then
476
      odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`"
476
      odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`"
477
      odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`"
477
      odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`"
(-)configure.in (-2 / +2 lines)
Lines 219-226 Link Here
219
AC_PROG_RANLIB
219
AC_PROG_RANLIB
220
AC_PROG_INSTALL
220
AC_PROG_INSTALL
221
AC_CHECK_PROG(RM, rm, rm)
221
AC_CHECK_PROG(RM, rm, rm)
222
AC_CHECK_PROG(AS, as, as)
222
AC_CHECK_TOOL(AS, as, as)
223
AC_CHECK_PROG(ASCPP, cpp, cpp)
223
AC_CHECK_TOOL(ASCPP, cpp, cpp)
224
AC_CHECK_TOOL(AR, ar, ar)
224
AC_CHECK_TOOL(AR, ar, ar)
225
225
226
dnl Various OS checks that apparently set required flags
226
dnl Various OS checks that apparently set required flags

Return to bug 56866