Remove the USE_WIN32STREAMEXTRACTION #defines (always on)

[bacula/bacula] / bacula / configure

diff --git a/bacula/configure b/bacula/configure
index 7da6e4bb2a25b94841463b9c7110c9015ebd1065..a19250e0d583f5137991ad4a8f690c23c62a30c7 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -16683,7 +16683,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
 if test $ac_cv_lib_crypt_crypt = yes; then
-  POSTGRESQL_LFLAGS="-lcrypt $POSTGRESQL_LFLAGS"
+  POSTGRESQL_LFLAGS="$POSTGRESQL_LFLAGS -lcrypt"
 fi
 
 fi
@@ -28770,6 +28770,9 @@ _ACEOF
   have_zlib=yes
 fi
 
+#
+# Check for ACL libraries
+#
 have_acl=no
 if test "${ac_cv_header_sys_acl_h+set}" = set; then
   echo "$as_me:$LINENO: checking for sys/acl.h" >&5
@@ -29069,6 +29072,76 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
 echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6
 if test $ac_cv_lib_acl_acl_get_file = yes; then
   have_acl=yes; FDLIBS="-lacl $FDLIBS"
+else
+  echo "$as_me:$LINENO: checking for acltotext in -lsec" >&5
+echo $ECHO_N "checking for acltotext in -lsec... $ECHO_C" >&6
+if test "${ac_cv_lib_sec_acltotext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsec  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char acltotext ();
+int
+main ()
+{
+acltotext ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_sec_acltotext=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_sec_acltotext=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_sec_acltotext" >&5
+echo "${ECHO_T}$ac_cv_lib_sec_acltotext" >&6
+if test $ac_cv_lib_sec_acltotext = yes; then
+  have_acl=yes; FDLIBS="-lsec $FDLIBS"
+fi
+
+
 fi
 
 
@@ -31361,6 +31434,9 @@ chmod 755 $c/grant_mysql_privileges   $c/drop_mysql_tables     $c/drop_mysql_dat
 chmod 755 $c/create_sqlite_database   $c/update_sqlite_tables  $c/make_sqlite_tables
 chmod 755 $c/grant_sqlite_privileges  $c/drop_sqlite_tables    $c/drop_sqlite_database
 
+chmod 755 $c/create_sqlite3_database   $c/update_sqlite3_tables  $c/make_sqlite3_tables
+chmod 755 $c/grant_sqlite3_privileges  $c/drop_sqlite3_tables   $c/drop_sqlite3_database
+
 chmod 755 $c/create_postgresql_database  $c/update_postgresql_tables $c/make_postgresql_tables
 chmod 755 $c/grant_postgresql_privileges $c/drop_postgresql_tables   $c/drop_postgresql_database