From: Kern Sibbald Date: Wed, 15 Oct 2008 07:55:59 +0000 (+0000) Subject: Correct aclocal.m4 X-Git-Tag: Release-7.0.0~3947 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6f3c3d790798c0209d2033e63716604b603b434d;p=bacula%2Fbacula Correct aclocal.m4 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7800 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4 index 5d2c414224..69cce458e1 100644 --- a/bacula/autoconf/bacula-macros/db.m4 +++ b/bacula/autoconf/bacula-macros/db.m4 @@ -3,7 +3,10 @@ AC_DEFUN([BA_CHECK_DBI_DB], db_found=no AC_MSG_CHECKING(for DBI support) AC_ARG_WITH(dbi, -AC_HELP_STRING([--with-dbi@<:@=DIR@:>@], [Include DBI support. DIR is the DBD base install directory, default is to search through a number of common places for the DBI files.]), +[ + --with-dbi@<:@=DIR@:>@ Include DBI support. DIR is the DBD base + install directory, default is to search through + a number of common places for the DBI files.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -123,7 +126,10 @@ db_found=no db_prog=no AC_MSG_CHECKING(for DBI drivers support) AC_ARG_WITH(dbi-driver, -AC_HELP_STRING([--with-dbi-driver@<:@=DRIVER@:>@], [Suport for DBI driver. DRIVER is the one DBI driver like Mysql, Postgresql, others. Default is to not configure any driver.]), +[ + --with-dbi-driver@<:@=DRIVER@:>@ Suport for DBI driver. DRIVER is + the one DBI driver like Mysql, Postgresql, others. + Default is to not configure any driver.], [ if test "$withval" != "no"; then case $withval in @@ -300,7 +306,10 @@ AC_DEFUN([BA_CHECK_MYSQL_DB], db_found=no AC_MSG_CHECKING(for MySQL support) AC_ARG_WITH(mysql, -AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files.]), +[ + --with-mysql@<:@=DIR@:>@ Include MySQL support. DIR is the MySQL base + install directory, default is to search through + a number of common places for the MySQL files.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -407,7 +416,10 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My ) AC_ARG_WITH(embedded-mysql, -AC_HELP_STRING([--with-embedded-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files.]), +[ + --with-embedded-mysql@<:@=DIR@:>@ Include MySQL support. DIR is the MySQL base + install directory, default is to search through + a number of common places for the MySQL files.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -509,7 +521,10 @@ AC_DEFUN([BA_CHECK_SQLITE_DB], db_found=no AC_MSG_CHECKING(for SQLite support) AC_ARG_WITH(sqlite, -AC_HELP_STRING([--with-sqlite@<:@=DIR@:>@], [Include SQLite support. DIR is the SQLite base install directory, default is to search through a number of common places for the SQLite files.]), +[ + --with-sqlite@<:@=DIR@:>@ Include SQLite support. DIR is the SQLite base + install directory, default is to search through + a number of common places for the SQLite files.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -588,7 +603,10 @@ AC_DEFUN([BA_CHECK_SQLITE3_DB], db_found=no AC_MSG_CHECKING(for SQLite3 support) AC_ARG_WITH(sqlite3, -AC_HELP_STRING([--with-sqlite3@<:@=DIR@:>@], [Include SQLite3 support. DIR is the SQLite3 base install directory, default is to search through a number of common places for the SQLite3 files.]), +[ + --with-sqlite3@<:@=DIR@:>@ Include SQLite3 support. DIR is the SQLite3 base + install directory, default is to search through + a number of common places for the SQLite3 files.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -669,7 +687,8 @@ AC_DEFUN([BA_CHECK_POSTGRESQL_DB], db_found=no AC_MSG_CHECKING(for PostgreSQL support) AC_ARG_WITH(postgresql, -AC_HELP_STRING([--with-postgresql@<:@=DIR@:>@], [Include PostgreSQL support. DIR is the PostgreSQL base install directory, @<:@default=/usr/local/pgsql@:>@]), +[ --with-postgresql@<:@=DIR@:>@ Include PostgreSQL support. DIR is the PostgreSQL + base install directory, defaults to /usr/local/pgsql], [ if test "$withval" != "no"; then if test "$db_found" = "yes"; then @@ -777,7 +796,10 @@ fi AC_MSG_CHECKING(for Berkeley DB support) AC_ARG_WITH(berkeleydb, -AC_HELP_STRING([--with-berkeleydb@<:@=DIR@:>@], [Include Berkeley DB support. DIR is the Berkeley DB base install directory, default is to search through a number of common places for the DB files.]), +[ + --with-berkeleydb@<:@=DIR@:>@ Include Berkeley DB support. DIR is the Berkeley DB base + install directory, default is to search through + a number of common places for the DB files.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -832,7 +854,8 @@ fi AC_MSG_CHECKING(for mSQL support) AC_ARG_WITH(msql, -AC_HELP_STRING([--with-msql@<:@=DIR@:>@], [Include mSQL support. DIR is the mSQL base install directory @<:@default=/usr/local/Hughes@:>@]), +[ --with-msql@<:@=DIR@:> Include mSQL support. DIR is the mSQL base + install directory, defaults to /usr/local/Hughes.], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then @@ -873,7 +896,8 @@ AC_SUBST(MSQL_INCLUDE) AC_MSG_CHECKING(for iODBC support) AC_ARG_WITH(iodbc, -AC_HELP_STRING([--with-iodbc@<:@=DIR@:>], [Include iODBC support. DIR is the iODBC base install directory @<:@default=/usr/local@:>@]), +[ --with-iodbc@<:@=DIR@:> Include iODBC support. DIR is the iODBC base + install directory, defaults to /usr/local.], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then @@ -913,7 +937,8 @@ AC_SUBST(IODBC_INCLUDE) AC_MSG_CHECKING(for unixODBC support) AC_ARG_WITH(unixODBC, -AC_HELP_STRING([--with-unixODBC@<:@=DIR@:>], [Include unixODBC support. DIR is the unixODBC base install directory @<:@default=/usr/local@:>@]), +[ --with-unixODBC@<:@=DIR@:> Include unixODBC support. DIR is the unixODBC base + install directory, defaults to /usr/local.], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then @@ -953,7 +978,8 @@ AC_SUBST(UNIXODBC_INCLUDE) AC_MSG_CHECKING(for Solid support) AC_ARG_WITH(solid, -AC_HELP_STRING([--with-solid@<:@=DIR@:>], [Include Solid support. DIR is the Solid base install directory @<:@default=/usr/local@:>@]), +[ --with-solid@<:@=DIR@:> Include Solid support. DIR is the Solid base + install directory, defaults to /usr/local.], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then @@ -992,7 +1018,8 @@ AC_SUBST(SOLID_INCLUDE) AC_MSG_CHECKING(for OpenLink ODBC support) AC_ARG_WITH(openlink, -AC_HELP_STRING([--with-openlink@<:@=DIR@:>], [Include OpenLink ODBC support. DIR is the base OpenLink ODBC install directory]), +[ --with-openlink@<:@=DIR@:> Include OpenLink ODBC support. + DIR is the base OpenLink ODBC install directory], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -1066,7 +1093,8 @@ AC_SUBST(VIRT_INCLUDE) AC_MSG_CHECKING(for EasySoft ODBC support) AC_ARG_WITH(easysoft, -AC_HELP_STRING([--with-easysoft@<:@=DIR@:>], [Include EasySoft ODBC support. DIR is the base EasySoft ODBC install directory]), +[ --with-easysoft@<:@=DIR@:> Include EasySoft ODBC support. + DIR is the base EasySoft ODBC install directory], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -1120,7 +1148,8 @@ AC_SUBST(EASYSOFT_INCLUDE) AC_MSG_CHECKING(for InterBase support) AC_ARG_WITH(ibase, -AC_HELP_STRING([--with-ibase@<:@=DIR@:>@], [Include InterBase support. DIR is the InterBase install directory @<:@default=/usr/interbase@:>@]), +[ --with-ibase@<:@=DIR@:> Include InterBase support. DIR is the InterBase + install directory, defaults to /usr/interbase.], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then @@ -1159,7 +1188,9 @@ AC_SUBST(IBASE_INCLUDE) AC_MSG_CHECKING(for Oracle8 support) AC_ARG_WITH(oracle8, -AC_HELP_STRING([--with-oracle8@<:@=DIR@:>@], [Include Oracle8 support. DIR is the Oracle home directory @<:@default=$ORACLE_HOME or /oracle8/app/oracle/product/8.0.5@:>@]), +[ --with-oracle8@<:@=DIR@:> Include Oracle8 support. DIR is the Oracle + home directory, defaults to $ORACLE_HOME or + /oracle8/app/oracle/product/8.0.5.], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then @@ -1214,7 +1245,9 @@ AC_SUBST(ORACLE8_INCLUDE) AC_MSG_CHECKING(for Oracle7 support) AC_ARG_WITH(oracle7, -AC_HELP_STRING([--with-oracle7@<:@=DIR@:>@], [Include Oracle 7.3 support. DIR is the Oracle home directory @<:@default=$ORACLE_HOME@:>@]), +[ --with-oracle7@<:@=DIR@:> Include Oracle 7.3 support. DIR is the Oracle + home directory, defaults to + ORACLE_HOME [$ORACLE_HOME]], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then diff --git a/bacula/configure b/bacula/configure index 8edf8b766d..6f0eda3727 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1719,28 +1719,32 @@ Optional Packages: --with-fd-user=USER specify user for File daemon --with-fd-group=GROUP specify group for File daemon --with-sbin-perm=MODE specify permissions for sbin binaries [default=0754] - --with-postgresql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL - base install directory, [default=/usr/local/pgsql] - --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base install - directory, default is to search through a number of - common places for the MySQL files. - --with-embedded-mysql[=DIR] - Include MySQL support. DIR is the MySQL base install - directory, default is to search through a number of - common places for the MySQL files. - --with-sqlite3[=DIR] Include SQLite3 support. DIR is the SQLite3 base - install directory, default is to search through a - number of common places for the SQLite3 files. - --with-sqlite[=DIR] Include SQLite support. DIR is the SQLite base - install directory, default is to search through a - number of common places for the SQLite files. - --with-dbi[=DIR] Include DBI support. DIR is the DBD base install - directory, default is to search through a number of - common places for the DBI files. - --with-dbi-driver[=DRIVER] - Suport for DBI driver. DRIVER is the one DBI driver - like Mysql, Postgresql, others. Default is to not - configure any driver. + --with-postgresql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL + base install directory, defaults to /usr/local/pgsql + + --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base + install directory, default is to search through + a number of common places for the MySQL files. + + --with-embedded-mysql[=DIR] Include MySQL support. DIR is the MySQL base + install directory, default is to search through + a number of common places for the MySQL files. + + --with-sqlite3[=DIR] Include SQLite3 support. DIR is the SQLite3 base + install directory, default is to search through + a number of common places for the SQLite3 files. + + --with-sqlite[=DIR] Include SQLite support. DIR is the SQLite base + install directory, default is to search through + a number of common places for the SQLite files. + + --with-dbi[=DIR] Include DBI support. DIR is the DBD base + install directory, default is to search through + a number of common places for the DBI files. + + --with-dbi-driver[=DRIVER] Suport for DBI driver. DRIVER is + the one DBI driver like Mysql, Postgresql, others. + Default is to not configure any driver. --with-x use the X Window System Some influential environment variables: @@ -5931,13 +5935,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5934: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5938: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5937: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5941: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5940: output\"" >&5) + (eval echo "\"\$as_me:5944: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7158,7 +7162,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7161 "configure"' > conftest.$ac_ext + echo '#line 7165 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9373,11 +9377,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9376: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9380: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9380: \$? = $ac_status" >&5 + echo "$as_me:9384: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9712,11 +9716,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9715: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9719: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9719: \$? = $ac_status" >&5 + echo "$as_me:9723: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9817,11 +9821,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9820: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9824: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9824: \$? = $ac_status" >&5 + echo "$as_me:9828: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9872,11 +9876,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9875: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9879: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9879: \$? = $ac_status" >&5 + echo "$as_me:9883: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12628,7 +12632,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12631 "configure" +#line 12635 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12724,7 +12728,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12727 "configure" +#line 12731 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14736,11 +14740,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14739: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14743: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14743: \$? = $ac_status" >&5 + echo "$as_me:14747: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14835,11 +14839,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14838: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14842: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14842: \$? = $ac_status" >&5 + echo "$as_me:14846: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14887,11 +14891,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14890: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14894: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14894: \$? = $ac_status" >&5 + echo "$as_me:14898: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized