Blame SOURCES/cyrus-sasl-2.1.26-sql.patch

296055
diff -up ./configure.in.sql ./configure.in
296055
--- ./configure.in.sql	2013-11-14 13:19:19.231000002 +0100
296055
+++ ./configure.in	2013-11-14 14:10:44.728997789 +0100
296055
@@ -729,7 +729,18 @@ LIB_MYSQL=""
296055
 
296055
 case "$with_mysql" in
296055
     no) true;;
296055
-    notfound) AC_WARN([MySQL Library not found]); true;;
296055
+    notfound) 
296055
+     save_LDFLAGS=$LDFLAGS
296055
+     LIB_MYSQL=`mysql_config --libs`
296055
+     LIB_MYSQL="-lmysqlclient"
296055
+     LDFLAGS="$LDFLAGS $LIB_MYSQL"
296055
+     # CPPFLAGS="${CPPFLAGS} `mysql_config --include`"
296055
+     AC_CHECK_LIB(mysqlclient, mysql_select_db,
296055
+           AC_DEFINE(HAVE_MYSQL, [], [Do we have mysql support?]),
296055
+           [AC_WARN([MySQL library mysqlclient does not work])
296055
+            with_mysql=no])
296055
+     LDFLAGS=$save_LDFLAGS
296055
+     ;;
296055
     *)
296055
      if test -d ${with_mysql}/lib/mysql; then
296055
 	CMU_ADD_LIBPATH_TO(${with_mysql}/lib/mysql, LIB_MYSQL)
296055
@@ -750,6 +761,8 @@ case "$with_mysql" in
296055
          CPPFLAGS="${CPPFLAGS} -I${with_mysql}/mysql/include"
296055
      elif test -d ${with_mysql}/include; then
296055
          CPPFLAGS="${CPPFLAGS} -I${with_mysql}/include"
296055
+     elif test -d ${prefix}/include/mysql; then
296055
+         CPPFLAGS="${CPPFLAGS} -I${prefix}/include/mysql"
296055
      else
296055
          CPPFLAGS="${CPPFLAGS} -I${with_mysql}"
296055
      fi
296055
@@ -793,7 +806,17 @@ LIB_PGSQL=""
296055
 
296055
 case "$with_pgsql" in
296055
     no) true;;
296055
-    notfound) AC_WARN([PostgreSQL Library not found]); true;;
296055
+    notfound)
296055
+     LIB_PGSQL="-lpq"
296055
+     # CPPFLAGS="${CPPFLAGS} -I`pg_config --includedir`"
296055
+     save_LDFLAGS=$LDFLAGS
296055
+     LDFLAGS="$LDFLAGS $LIB_PGSQL"
296055
+     AC_CHECK_LIB(pq, PQsetdbLogin, AC_DEFINE(HAVE_PGSQL,[],
296055
+         [Do we have Postgres support?]),
296055
+         [AC_WARN([PostgreSQL Library pq does not work])
296055
+          with_pgsql=no])
296055
+     LDFLAGS=$save_LDFLAGS
296055
+     ;;
296055
     *)
296055
      if test -d ${with_pgsql}/lib/pgsql; then
296055
 	CMU_ADD_LIBPATH_TO(${with_pgsql}/lib/pgsql, LIB_PGSQL)
296055
@@ -814,6 +837,8 @@ case "$with_pgsql" in
296055
          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
296055
      elif test -d ${with_pgsql}/include; then
296055
          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include"
296055
+     elif test -d ${prefix}/include; then
296055
+         CPPFLAGS="${CPPFLAGS} -I${prefix}/include"
296055
      else
296055
          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}"
296055
      fi
296055
diff -up ./configure.sql ./configure
296055
--- ./configure.sql	2013-11-14 13:19:19.177000002 +0100
296055
+++ ./configure	2013-11-14 14:10:50.848000001 +0100
296055
@@ -4340,116 +4340,8 @@ $as_echo "$ac_cv___attribute__" >&6; }
296055
 
296055
 
296055
    # CMU GUESS RUNPATH SWITCH
296055
-  { $as_echo "$as_me:$LINENO: checking for runpath switch" >&5
296055
-$as_echo_n "checking for runpath switch... " >&6; }
296055
-if test "${andrew_cv_runpath_switch+set}" = set; then
296055
-  $as_echo_n "(cached) " >&6
296055
-else
296055
-
296055
-    # first, try -R
296055
-    SAVE_LDFLAGS="${LDFLAGS}"
296055
-    LDFLAGS="-R /usr/lib"
296055
-    cat >conftest.$ac_ext <<_ACEOF
296055
-/* confdefs.h.  */
296055
-_ACEOF
296055
-cat confdefs.h >>conftest.$ac_ext
296055
-cat >>conftest.$ac_ext <<_ACEOF
296055
-/* end confdefs.h.  */
296055
-
296055
-int
296055
-main ()
296055
-{
296055
-
296055
-  ;
296055
-  return 0;
296055
-}
296055
-_ACEOF
296055
-rm -f conftest.$ac_objext conftest$ac_exeext
296055
-if { (ac_try="$ac_link"
296055
-case "(($ac_try" in
296055
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
-  *) ac_try_echo=$ac_try;;
296055
-esac
296055
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
-$as_echo "$ac_try_echo") >&5
296055
-  (eval "$ac_link") 2>conftest.er1
296055
-  ac_status=$?
296055
-  grep -v '^ *+' conftest.er1 >conftest.err
296055
-  rm -f conftest.er1
296055
-  cat conftest.err >&5
296055
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
-  (exit $ac_status); } && {
296055
-	 test -z "$ac_c_werror_flag" ||
296055
-	 test ! -s conftest.err
296055
-       } && test -s conftest$ac_exeext && {
296055
-	 test "$cross_compiling" = yes ||
296055
-	 $as_test_x conftest$ac_exeext
296055
-       }; then
296055
-  andrew_cv_runpath_switch="-R"
296055
-else
296055
-  $as_echo "$as_me: failed program was:" >&5
296055
-sed 's/^/| /' conftest.$ac_ext >&5
296055
-
296055
-
296055
-  	LDFLAGS="-Wl,-rpath,/usr/lib"
296055
-    cat >conftest.$ac_ext <<_ACEOF
296055
-/* confdefs.h.  */
296055
-_ACEOF
296055
-cat confdefs.h >>conftest.$ac_ext
296055
-cat >>conftest.$ac_ext <<_ACEOF
296055
-/* end confdefs.h.  */
296055
-
296055
-int
296055
-main ()
296055
-{
296055
-
296055
-  ;
296055
-  return 0;
296055
-}
296055
-_ACEOF
296055
-rm -f conftest.$ac_objext conftest$ac_exeext
296055
-if { (ac_try="$ac_link"
296055
-case "(($ac_try" in
296055
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
-  *) ac_try_echo=$ac_try;;
296055
-esac
296055
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
-$as_echo "$ac_try_echo") >&5
296055
-  (eval "$ac_link") 2>conftest.er1
296055
-  ac_status=$?
296055
-  grep -v '^ *+' conftest.er1 >conftest.err
296055
-  rm -f conftest.er1
296055
-  cat conftest.err >&5
296055
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
-  (exit $ac_status); } && {
296055
-	 test -z "$ac_c_werror_flag" ||
296055
-	 test ! -s conftest.err
296055
-       } && test -s conftest$ac_exeext && {
296055
-	 test "$cross_compiling" = yes ||
296055
-	 $as_test_x conftest$ac_exeext
296055
-       }; then
296055
-  andrew_cv_runpath_switch="-Wl,-rpath,"
296055
-else
296055
-  $as_echo "$as_me: failed program was:" >&5
296055
-sed 's/^/| /' conftest.$ac_ext >&5
296055
-
296055
-	andrew_cv_runpath_switch="none"
296055
-fi
296055
-
296055
-rm -rf conftest.dSYM
296055
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
296055
-      conftest$ac_exeext conftest.$ac_ext
296055
-
296055
-fi
296055
-
296055
-rm -rf conftest.dSYM
296055
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
296055
-      conftest$ac_exeext conftest.$ac_ext
296055
-  LDFLAGS="${SAVE_LDFLAGS}"
296055
+    andrew_runpath_switch="none"
296055
 
296055
-fi
296055
-{ $as_echo "$as_me:$LINENO: result: $andrew_cv_runpath_switch" >&5
296055
-$as_echo "$andrew_cv_runpath_switch" >&6; }
296055
 
296055
 
296055
 # Check whether --with-staticsasl was given.
296055
@@ -4784,7 +4676,7 @@ test x"$silent" = xyes && libtool_flags=
296055
 case "$lt_target" in
296055
 *-*-irix6*)
296055
   # Find out which ABI we are using.
296055
-  echo '#line 4787 "configure"' > conftest.$ac_ext
296055
+  echo '#line 4679 "configure"' > conftest.$ac_ext
296055
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
296055
   (eval $ac_compile) 2>&5
296055
   ac_status=$?
296055
@@ -11239,7 +11131,6 @@ $as_echo "$cyrus_krbinclude" >&6; }
296055
        if test -n "${cyrus_krbinclude}"; then
296055
          CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
296055
        fi
296055
-       LDFLAGS="$LDFLAGS -L$krb4/lib"
296055
     fi
296055
 
296055
     if test "$with_des" != no; then
296055
@@ -13467,69 +13358,43 @@ _ACEOF
296055
 fi
296055
 done
296055
 
296055
+  if test "$ac_cv_func_gsskrb5_register_acceptor_identity" = no ; then
296055
 
296055
-for ac_func in gss_decapsulate_token
296055
+for ac_header in gssapi/gssapi_krb5.h
296055
 do
296055
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
296055
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
296055
-$as_echo_n "checking for $ac_func... " >&6; }
296055
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
296055
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
296055
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
296055
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
296055
+$as_echo_n "checking for $ac_header... " >&6; }
296055
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
296055
   $as_echo_n "(cached) " >&6
296055
+fi
296055
+ac_res=`eval 'as_val=${'$as_ac_Header'}
296055
+		 $as_echo "$as_val"'`
296055
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
296055
+$as_echo "$ac_res" >&6; }
296055
 else
296055
-  cat >conftest.$ac_ext <<_ACEOF
296055
+  # Is the header compilable?
296055
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
296055
+$as_echo_n "checking $ac_header usability... " >&6; }
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
 /* confdefs.h.  */
296055
 _ACEOF
296055
 cat confdefs.h >>conftest.$ac_ext
296055
 cat >>conftest.$ac_ext <<_ACEOF
296055
 /* end confdefs.h.  */
296055
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
296055
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
296055
-#define $ac_func innocuous_$ac_func
296055
-
296055
-/* System header to define __stub macros and hopefully few prototypes,
296055
-    which can conflict with char $ac_func (); below.
296055
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
296055
-    <limits.h> exists even on freestanding compilers.  */
296055
-
296055
-#ifdef __STDC__
296055
-# include <limits.h>
296055
-#else
296055
-# include <assert.h>
296055
-#endif
296055
-
296055
-#undef $ac_func
296055
-
296055
-/* Override any GCC internal prototype to avoid an error.
296055
-   Use char because int might match the return type of a GCC
296055
-   builtin and then its argument prototype would still apply.  */
296055
-#ifdef __cplusplus
296055
-extern "C"
296055
-#endif
296055
-char $ac_func ();
296055
-/* The GNU C library defines this for functions which it implements
296055
-    to always fail with ENOSYS.  Some functions are actually named
296055
-    something starting with __ and the normal name is an alias.  */
296055
-#if defined __stub_$ac_func || defined __stub___$ac_func
296055
-choke me
296055
-#endif
296055
-
296055
-int
296055
-main ()
296055
-{
296055
-return $ac_func ();
296055
-  ;
296055
-  return 0;
296055
-}
296055
+$ac_includes_default
296055
+#include <$ac_header>
296055
 _ACEOF
296055
-rm -f conftest.$ac_objext conftest$ac_exeext
296055
-if { (ac_try="$ac_link"
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
 case "(($ac_try" in
296055
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
   *) ac_try_echo=$ac_try;;
296055
 esac
296055
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
 $as_echo "$ac_try_echo") >&5
296055
-  (eval "$ac_link") 2>conftest.er1
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
   ac_status=$?
296055
   grep -v '^ *+' conftest.er1 >conftest.err
296055
   rm -f conftest.er1
296055
@@ -13538,139 +13403,178 @@ $as_echo "$ac_try_echo") >&5
296055
   (exit $ac_status); } && {
296055
 	 test -z "$ac_c_werror_flag" ||
296055
 	 test ! -s conftest.err
296055
-       } && test -s conftest$ac_exeext && {
296055
-	 test "$cross_compiling" = yes ||
296055
-	 $as_test_x conftest$ac_exeext
296055
-       }; then
296055
-  eval "$as_ac_var=yes"
296055
+       } && test -s conftest.$ac_objext; then
296055
+  ac_header_compiler=yes
296055
 else
296055
   $as_echo "$as_me: failed program was:" >&5
296055
 sed 's/^/| /' conftest.$ac_ext >&5
296055
 
296055
-	eval "$as_ac_var=no"
296055
-fi
296055
-
296055
-rm -rf conftest.dSYM
296055
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
296055
-      conftest$ac_exeext conftest.$ac_ext
296055
-fi
296055
-ac_res=`eval 'as_val=${'$as_ac_var'}
296055
-		 $as_echo "$as_val"'`
296055
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
296055
-$as_echo "$ac_res" >&6; }
296055
-as_val=`eval 'as_val=${'$as_ac_var'}
296055
-		 $as_echo "$as_val"'`
296055
-   if test "x$as_val" = x""yes; then
296055
-  cat >>confdefs.h <<_ACEOF
296055
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
296055
-_ACEOF
296055
-
296055
+	ac_header_compiler=no
296055
 fi
296055
-done
296055
 
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
296055
+$as_echo "$ac_header_compiler" >&6; }
296055
 
296055
-for ac_func in gss_encapsulate_token
296055
-do
296055
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
296055
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
296055
-$as_echo_n "checking for $ac_func... " >&6; }
296055
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
296055
-  $as_echo_n "(cached) " >&6
296055
-else
296055
-  cat >conftest.$ac_ext <<_ACEOF
296055
+# Is the header present?
296055
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
296055
+$as_echo_n "checking $ac_header presence... " >&6; }
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
 /* confdefs.h.  */
296055
 _ACEOF
296055
 cat confdefs.h >>conftest.$ac_ext
296055
 cat >>conftest.$ac_ext <<_ACEOF
296055
 /* end confdefs.h.  */
296055
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
296055
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
296055
-#define $ac_func innocuous_$ac_func
296055
-
296055
-/* System header to define __stub macros and hopefully few prototypes,
296055
-    which can conflict with char $ac_func (); below.
296055
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
296055
-    <limits.h> exists even on freestanding compilers.  */
296055
-
296055
-#ifdef __STDC__
296055
-# include <limits.h>
296055
-#else
296055
-# include <assert.h>
296055
-#endif
296055
-
296055
-#undef $ac_func
296055
-
296055
-/* Override any GCC internal prototype to avoid an error.
296055
-   Use char because int might match the return type of a GCC
296055
-   builtin and then its argument prototype would still apply.  */
296055
-#ifdef __cplusplus
296055
-extern "C"
296055
-#endif
296055
-char $ac_func ();
296055
-/* The GNU C library defines this for functions which it implements
296055
-    to always fail with ENOSYS.  Some functions are actually named
296055
-    something starting with __ and the normal name is an alias.  */
296055
-#if defined __stub_$ac_func || defined __stub___$ac_func
296055
-choke me
296055
-#endif
296055
-
296055
-int
296055
-main ()
296055
-{
296055
-return $ac_func ();
296055
-  ;
296055
-  return 0;
296055
-}
296055
+#include <$ac_header>
296055
 _ACEOF
296055
-rm -f conftest.$ac_objext conftest$ac_exeext
296055
-if { (ac_try="$ac_link"
296055
+if { (ac_try="$ac_cpp conftest.$ac_ext"
296055
 case "(($ac_try" in
296055
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
   *) ac_try_echo=$ac_try;;
296055
 esac
296055
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
 $as_echo "$ac_try_echo") >&5
296055
-  (eval "$ac_link") 2>conftest.er1
296055
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
296055
   ac_status=$?
296055
   grep -v '^ *+' conftest.er1 >conftest.err
296055
   rm -f conftest.er1
296055
   cat conftest.err >&5
296055
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
-  (exit $ac_status); } && {
296055
-	 test -z "$ac_c_werror_flag" ||
296055
+  (exit $ac_status); } >/dev/null && {
296055
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
296055
 	 test ! -s conftest.err
296055
-       } && test -s conftest$ac_exeext && {
296055
-	 test "$cross_compiling" = yes ||
296055
-	 $as_test_x conftest$ac_exeext
296055
        }; then
296055
-  eval "$as_ac_var=yes"
296055
+  ac_header_preproc=yes
296055
 else
296055
   $as_echo "$as_me: failed program was:" >&5
296055
 sed 's/^/| /' conftest.$ac_ext >&5
296055
 
296055
-	eval "$as_ac_var=no"
296055
+  ac_header_preproc=no
296055
 fi
296055
 
296055
-rm -rf conftest.dSYM
296055
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
296055
-      conftest$ac_exeext conftest.$ac_ext
296055
+rm -f conftest.err conftest.$ac_ext
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
296055
+$as_echo "$ac_header_preproc" >&6; }
296055
+
296055
+# So?  What about this header?
296055
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
296055
+  yes:no: )
296055
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
296055
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
296055
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
296055
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
296055
+    ac_header_preproc=yes
296055
+    ;;
296055
+  no:yes:* )
296055
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
296055
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
296055
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
296055
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
296055
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
296055
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
296055
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
296055
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
296055
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
296055
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
296055
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
296055
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
296055
+
296055
+    ;;
296055
+esac
296055
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
296055
+$as_echo_n "checking for $ac_header... " >&6; }
296055
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  eval "$as_ac_Header=\$ac_header_preproc"
296055
 fi
296055
-ac_res=`eval 'as_val=${'$as_ac_var'}
296055
+ac_res=`eval 'as_val=${'$as_ac_Header'}
296055
 		 $as_echo "$as_val"'`
296055
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
296055
 $as_echo "$ac_res" >&6; }
296055
-as_val=`eval 'as_val=${'$as_ac_var'}
296055
+
296055
+fi
296055
+as_val=`eval 'as_val=${'$as_ac_Header'}
296055
 		 $as_echo "$as_val"'`
296055
    if test "x$as_val" = x""yes; then
296055
   cat >>confdefs.h <<_ACEOF
296055
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
296055
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
296055
 _ACEOF
296055
 
296055
 fi
296055
+
296055
 done
296055
 
296055
+    if test "$ac_cv_header_gssapi_gssapi_krb5_h" = "yes"; then
296055
+      { $as_echo "$as_me:$LINENO: checking whether gsskrb5_register_acceptor_identity is declared" >&5
296055
+$as_echo_n "checking whether gsskrb5_register_acceptor_identity is declared... " >&6; }
296055
+if test "${ac_cv_have_decl_gsskrb5_register_acceptor_identity+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+                    $ac_includes_default
296055
+                    #include <gssapi/gssapi_krb5.h>
296055
 
296055
-for ac_func in gss_oid_equal
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+#ifndef gsskrb5_register_acceptor_identity
296055
+  (void) gsskrb5_register_acceptor_identity;
296055
+#endif
296055
+
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  ac_cv_have_decl_gsskrb5_register_acceptor_identity=yes
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_have_decl_gsskrb5_register_acceptor_identity=no
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gsskrb5_register_acceptor_identity" >&5
296055
+$as_echo "$ac_cv_have_decl_gsskrb5_register_acceptor_identity" >&6; }
296055
+if test "x$ac_cv_have_decl_gsskrb5_register_acceptor_identity" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<\_ACEOF
296055
+#define HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 1
296055
+_ACEOF
296055
+
296055
+fi
296055
+
296055
+    fi
296055
+  fi
296055
+
296055
+for ac_func in gss_decapsulate_token
296055
 do
296055
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
296055
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
296055
@@ -13770,12 +13674,8 @@ _ACEOF
296055
 fi
296055
 done
296055
 
296055
-  LIBS="$cmu_save_LIBS"
296055
-
296055
-  cmu_save_LIBS="$LIBS"
296055
-  LIBS="$LIBS $GSSAPIBASE_LIBS"
296055
 
296055
-for ac_func in gss_get_name_attribute
296055
+for ac_func in gss_encapsulate_token
296055
 do
296055
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
296055
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
296055
@@ -13875,20 +13775,14 @@ _ACEOF
296055
 fi
296055
 done
296055
 
296055
-  LIBS="$cmu_save_LIBS"
296055
 
296055
-  cmu_save_LIBS="$LIBS"
296055
-  LIBS="$LIBS $GSSAPIBASE_LIBS"
296055
-  { $as_echo "$as_me:$LINENO: checking for SPNEGO support in GSSAPI libraries" >&5
296055
-$as_echo_n "checking for SPNEGO support in GSSAPI libraries... " >&6; }
296055
-  if test "$cross_compiling" = yes; then
296055
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
296055
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
296055
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
296055
-See \`config.log' for more details." >&5
296055
-$as_echo "$as_me: error: cannot run test program while cross compiling
296055
-See \`config.log' for more details." >&2;}
296055
-   { (exit 1); exit 1; }; }; }
296055
+for ac_func in gss_oid_equal
296055
+do
296055
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
296055
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
296055
+$as_echo_n "checking for $ac_func... " >&6; }
296055
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
296055
+  $as_echo_n "(cached) " >&6
296055
 else
296055
   cat >conftest.$ac_ext <<_ACEOF
296055
 /* confdefs.h.  */
296055
@@ -13896,30 +13790,46 @@ _ACEOF
296055
 cat confdefs.h >>conftest.$ac_ext
296055
 cat >>conftest.$ac_ext <<_ACEOF
296055
 /* end confdefs.h.  */
296055
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
296055
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
296055
+#define $ac_func innocuous_$ac_func
296055
 
296055
-#ifdef HAVE_GSSAPI_H
296055
-#include <gssapi.h>
296055
+/* System header to define __stub macros and hopefully few prototypes,
296055
+    which can conflict with char $ac_func (); below.
296055
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
296055
+    <limits.h> exists even on freestanding compilers.  */
296055
+
296055
+#ifdef __STDC__
296055
+# include <limits.h>
296055
 #else
296055
-#include <gssapi/gssapi.h>
296055
+# include <assert.h>
296055
 #endif
296055
 
296055
-int main(void)
296055
-{
296055
-    gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" };
296055
-    gss_OID_set mech_set;
296055
-    OM_uint32 min_stat;
296055
-    int have_spnego = 0;
296055
+#undef $ac_func
296055
 
296055
-    if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) {
296055
-	gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego);
296055
-	gss_release_oid_set(&min_stat, &mech_set);
296055
-    }
296055
+/* Override any GCC internal prototype to avoid an error.
296055
+   Use char because int might match the return type of a GCC
296055
+   builtin and then its argument prototype would still apply.  */
296055
+#ifdef __cplusplus
296055
+extern "C"
296055
+#endif
296055
+char $ac_func ();
296055
+/* The GNU C library defines this for functions which it implements
296055
+    to always fail with ENOSYS.  Some functions are actually named
296055
+    something starting with __ and the normal name is an alias.  */
296055
+#if defined __stub_$ac_func || defined __stub___$ac_func
296055
+choke me
296055
+#endif
296055
 
296055
-    return (!have_spnego);  // 0 = success, 1 = failure
296055
+int
296055
+main ()
296055
+{
296055
+return $ac_func ();
296055
+  ;
296055
+  return 0;
296055
 }
296055
-
296055
 _ACEOF
296055
-rm -f conftest$ac_exeext
296055
+rm -f conftest.$ac_objext conftest$ac_exeext
296055
 if { (ac_try="$ac_link"
296055
 case "(($ac_try" in
296055
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
@@ -13927,63 +13837,259 @@ case "(($ac_try" in
296055
 esac
296055
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
 $as_echo "$ac_try_echo") >&5
296055
-  (eval "$ac_link") 2>&5
296055
-  ac_status=$?
296055
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
296055
-  { (case "(($ac_try" in
296055
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
-  *) ac_try_echo=$ac_try;;
296055
-esac
296055
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
-$as_echo "$ac_try_echo") >&5
296055
-  (eval "$ac_try") 2>&5
296055
+  (eval "$ac_link") 2>conftest.er1
296055
   ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
-  (exit $ac_status); }; }; then
296055
-
296055
-cat >>confdefs.h <<\_ACEOF
296055
-#define HAVE_GSS_SPNEGO /**/
296055
-_ACEOF
296055
-
296055
-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
296055
-$as_echo "yes" >&6; }
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest$ac_exeext && {
296055
+	 test "$cross_compiling" = yes ||
296055
+	 $as_test_x conftest$ac_exeext
296055
+       }; then
296055
+  eval "$as_ac_var=yes"
296055
 else
296055
-  $as_echo "$as_me: program exited with status $ac_status" >&5
296055
-$as_echo "$as_me: failed program was:" >&5
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
 sed 's/^/| /' conftest.$ac_ext >&5
296055
 
296055
-( exit $ac_status )
296055
-{ $as_echo "$as_me:$LINENO: result: no" >&5
296055
-$as_echo "no" >&6; }
296055
+	eval "$as_ac_var=no"
296055
 fi
296055
+
296055
 rm -rf conftest.dSYM
296055
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
296055
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
296055
+      conftest$ac_exeext conftest.$ac_ext
296055
 fi
296055
+ac_res=`eval 'as_val=${'$as_ac_var'}
296055
+		 $as_echo "$as_val"'`
296055
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
296055
+$as_echo "$ac_res" >&6; }
296055
+as_val=`eval 'as_val=${'$as_ac_var'}
296055
+		 $as_echo "$as_val"'`
296055
+   if test "x$as_val" = x""yes; then
296055
+  cat >>confdefs.h <<_ACEOF
296055
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
296055
+_ACEOF
296055
 
296055
-
296055
-  LIBS="$cmu_save_LIBS"
296055
-
296055
-else
296055
-  { $as_echo "$as_me:$LINENO: result: disabled" >&5
296055
-$as_echo "disabled" >&6; }
296055
 fi
296055
+done
296055
 
296055
+  LIBS="$cmu_save_LIBS"
296055
 
296055
+  cmu_save_LIBS="$LIBS"
296055
+  LIBS="$LIBS $GSSAPIBASE_LIBS"
296055
 
296055
-
296055
-if test "$gssapi" != "no"; then
296055
-
296055
-cat >>confdefs.h <<\_ACEOF
296055
-#define STATIC_GSSAPIV2 /**/
296055
-_ACEOF
296055
-
296055
-  mutex_default="no"
296055
-  if test "$gss_impl" = "mit"; then
296055
-     mutex_default="yes"
296055
-  fi
296055
-  { $as_echo "$as_me:$LINENO: checking to use mutexes aroung GSS calls" >&5
296055
-$as_echo_n "checking to use mutexes aroung GSS calls... " >&6; }
296055
+for ac_func in gss_get_name_attribute
296055
+do
296055
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
296055
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
296055
+$as_echo_n "checking for $ac_func... " >&6; }
296055
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
296055
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
296055
+#define $ac_func innocuous_$ac_func
296055
+
296055
+/* System header to define __stub macros and hopefully few prototypes,
296055
+    which can conflict with char $ac_func (); below.
296055
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
296055
+    <limits.h> exists even on freestanding compilers.  */
296055
+
296055
+#ifdef __STDC__
296055
+# include <limits.h>
296055
+#else
296055
+# include <assert.h>
296055
+#endif
296055
+
296055
+#undef $ac_func
296055
+
296055
+/* Override any GCC internal prototype to avoid an error.
296055
+   Use char because int might match the return type of a GCC
296055
+   builtin and then its argument prototype would still apply.  */
296055
+#ifdef __cplusplus
296055
+extern "C"
296055
+#endif
296055
+char $ac_func ();
296055
+/* The GNU C library defines this for functions which it implements
296055
+    to always fail with ENOSYS.  Some functions are actually named
296055
+    something starting with __ and the normal name is an alias.  */
296055
+#if defined __stub_$ac_func || defined __stub___$ac_func
296055
+choke me
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+return $ac_func ();
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext conftest$ac_exeext
296055
+if { (ac_try="$ac_link"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_link") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest$ac_exeext && {
296055
+	 test "$cross_compiling" = yes ||
296055
+	 $as_test_x conftest$ac_exeext
296055
+       }; then
296055
+  eval "$as_ac_var=yes"
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	eval "$as_ac_var=no"
296055
+fi
296055
+
296055
+rm -rf conftest.dSYM
296055
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
296055
+      conftest$ac_exeext conftest.$ac_ext
296055
+fi
296055
+ac_res=`eval 'as_val=${'$as_ac_var'}
296055
+		 $as_echo "$as_val"'`
296055
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
296055
+$as_echo "$ac_res" >&6; }
296055
+as_val=`eval 'as_val=${'$as_ac_var'}
296055
+		 $as_echo "$as_val"'`
296055
+   if test "x$as_val" = x""yes; then
296055
+  cat >>confdefs.h <<_ACEOF
296055
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
296055
+_ACEOF
296055
+
296055
+fi
296055
+done
296055
+
296055
+  LIBS="$cmu_save_LIBS"
296055
+
296055
+  cmu_save_LIBS="$LIBS"
296055
+  LIBS="$LIBS $GSSAPIBASE_LIBS"
296055
+  { $as_echo "$as_me:$LINENO: checking for SPNEGO support in GSSAPI libraries" >&5
296055
+$as_echo_n "checking for SPNEGO support in GSSAPI libraries... " >&6; }
296055
+  if test "$cross_compiling" = yes; then
296055
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
296055
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
296055
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
296055
+See \`config.log' for more details." >&5
296055
+$as_echo "$as_me: error: cannot run test program while cross compiling
296055
+See \`config.log' for more details." >&2;}
296055
+   { (exit 1); exit 1; }; }; }
296055
+else
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_GSSAPI_H
296055
+#include <gssapi.h>
296055
+#else
296055
+#include <gssapi/gssapi.h>
296055
+#endif
296055
+
296055
+int main(void)
296055
+{
296055
+    gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" };
296055
+    gss_OID_set mech_set;
296055
+    OM_uint32 min_stat;
296055
+    int have_spnego = 0;
296055
+
296055
+    if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) {
296055
+	gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego);
296055
+	gss_release_oid_set(&min_stat, &mech_set);
296055
+    }
296055
+
296055
+    return (!have_spnego);  // 0 = success, 1 = failure
296055
+}
296055
+
296055
+_ACEOF
296055
+rm -f conftest$ac_exeext
296055
+if { (ac_try="$ac_link"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_link") 2>&5
296055
+  ac_status=$?
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
296055
+  { (case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_try") 2>&5
296055
+  ac_status=$?
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); }; }; then
296055
+
296055
+cat >>confdefs.h <<\_ACEOF
296055
+#define HAVE_GSS_SPNEGO /**/
296055
+_ACEOF
296055
+
296055
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
296055
+$as_echo "yes" >&6; }
296055
+else
296055
+  $as_echo "$as_me: program exited with status $ac_status" >&5
296055
+$as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+( exit $ac_status )
296055
+{ $as_echo "$as_me:$LINENO: result: no" >&5
296055
+$as_echo "no" >&6; }
296055
+fi
296055
+rm -rf conftest.dSYM
296055
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+
296055
+
296055
+  LIBS="$cmu_save_LIBS"
296055
+
296055
+else
296055
+  { $as_echo "$as_me:$LINENO: result: disabled" >&5
296055
+$as_echo "disabled" >&6; }
296055
+fi
296055
+
296055
+
296055
+
296055
+
296055
+if test "$gssapi" != "no"; then
296055
+
296055
+cat >>confdefs.h <<\_ACEOF
296055
+#define STATIC_GSSAPIV2 /**/
296055
+_ACEOF
296055
+
296055
+  mutex_default="no"
296055
+  if test "$gss_impl" = "mit"; then
296055
+     mutex_default="yes"
296055
+  fi
296055
+  { $as_echo "$as_me:$LINENO: checking to use mutexes aroung GSS calls" >&5
296055
+$as_echo_n "checking to use mutexes aroung GSS calls... " >&6; }
296055
   # Check whether --enable-gss_mutexes was given.
296055
 if test "${enable_gss_mutexes+set}" = set; then
296055
   enableval=$enable_gss_mutexes; use_gss_mutexes=$enableval
296055
@@ -14246,44 +14352,127 @@ LIB_MYSQL=""
296055
 
296055
 case "$with_mysql" in
296055
     no) true;;
296055
-    notfound) { $as_echo "$as_me:$LINENO: WARNING: MySQL Library not found" >&5
296055
-$as_echo "$as_me: WARNING: MySQL Library not found" >&2;}; true;;
296055
-    *)
296055
-     if test -d ${with_mysql}/lib/mysql; then
296055
-
296055
-  # this is CMU ADD LIBPATH TO
296055
-  if test "$andrew_cv_runpath_switch" = "none" ; then
296055
-	LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL}"
296055
-  else
296055
-	LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib/mysql"
296055
-  fi
296055
-
296055
-     elif test -d ${with_mysql}/mysql/lib; then
296055
-
296055
-  # this is CMU ADD LIBPATH TO
296055
-  if test "$andrew_cv_runpath_switch" = "none" ; then
296055
-	LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL}"
296055
-  else
296055
-	LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/mysql/lib"
296055
-  fi
296055
-
296055
-     elif test -d ${with_mysql}/lib; then
296055
-
296055
-  # this is CMU ADD LIBPATH TO
296055
-  if test "$andrew_cv_runpath_switch" = "none" ; then
296055
-	LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL}"
296055
-  else
296055
-	LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib"
296055
-  fi
296055
-
296055
-     else
296055
+    notfound)
296055
+     save_LDFLAGS=$LDFLAGS
296055
+     LIB_MYSQL=`mysql_config --libs`
296055
+     LIB_MYSQL="-lmysqlclient"
296055
+     LDFLAGS="$LDFLAGS $LIB_MYSQL"
296055
+     # CPPFLAGS="${CPPFLAGS} `mysql_config --include`"
296055
+     { $as_echo "$as_me:$LINENO: checking for mysql_select_db in -lmysqlclient" >&5
296055
+$as_echo_n "checking for mysql_select_db in -lmysqlclient... " >&6; }
296055
+if test "${ac_cv_lib_mysqlclient_mysql_select_db+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_check_lib_save_LIBS=$LIBS
296055
+LIBS="-lmysqlclient  $LIBS"
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
 
296055
-  # this is CMU ADD LIBPATH TO
296055
-  if test "$andrew_cv_runpath_switch" = "none" ; then
296055
-	LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL}"
296055
-  else
296055
-	LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}"
296055
-  fi
296055
+/* Override any GCC internal prototype to avoid an error.
296055
+   Use char because int might match the return type of a GCC
296055
+   builtin and then its argument prototype would still apply.  */
296055
+#ifdef __cplusplus
296055
+extern "C"
296055
+#endif
296055
+char mysql_select_db ();
296055
+int
296055
+main ()
296055
+{
296055
+return mysql_select_db ();
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext conftest$ac_exeext
296055
+if { (ac_try="$ac_link"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_link") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest$ac_exeext && {
296055
+	 test "$cross_compiling" = yes ||
296055
+	 $as_test_x conftest$ac_exeext
296055
+       }; then
296055
+  ac_cv_lib_mysqlclient_mysql_select_db=yes
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_lib_mysqlclient_mysql_select_db=no
296055
+fi
296055
+
296055
+rm -rf conftest.dSYM
296055
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
296055
+      conftest$ac_exeext conftest.$ac_ext
296055
+LIBS=$ac_check_lib_save_LIBS
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_select_db" >&5
296055
+$as_echo "$ac_cv_lib_mysqlclient_mysql_select_db" >&6; }
296055
+if test "x$ac_cv_lib_mysqlclient_mysql_select_db" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<\_ACEOF
296055
+#define HAVE_MYSQL /**/
296055
+_ACEOF
296055
+
296055
+else
296055
+  { $as_echo "$as_me:$LINENO: WARNING: MySQL library mysqlclient does not work" >&5
296055
+$as_echo "$as_me: WARNING: MySQL library mysqlclient does not work" >&2;}
296055
+            with_mysql=no
296055
+fi
296055
+
296055
+     LDFLAGS=$save_LDFLAGS
296055
+     ;;
296055
+    *)
296055
+     if test -d ${with_mysql}/lib/mysql; then
296055
+
296055
+  # this is CMU ADD LIBPATH TO
296055
+  if test "$andrew_cv_runpath_switch" = "none" ; then
296055
+	LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL}"
296055
+  else
296055
+	LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib/mysql"
296055
+  fi
296055
+
296055
+     elif test -d ${with_mysql}/mysql/lib; then
296055
+
296055
+  # this is CMU ADD LIBPATH TO
296055
+  if test "$andrew_cv_runpath_switch" = "none" ; then
296055
+	LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL}"
296055
+  else
296055
+	LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/mysql/lib"
296055
+  fi
296055
+
296055
+     elif test -d ${with_mysql}/lib; then
296055
+
296055
+  # this is CMU ADD LIBPATH TO
296055
+  if test "$andrew_cv_runpath_switch" = "none" ; then
296055
+	LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL}"
296055
+  else
296055
+	LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib"
296055
+  fi
296055
+
296055
+     else
296055
+
296055
+  # this is CMU ADD LIBPATH TO
296055
+  if test "$andrew_cv_runpath_switch" = "none" ; then
296055
+	LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL}"
296055
+  else
296055
+	LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}"
296055
+  fi
296055
 
296055
      fi
296055
 
296055
@@ -14296,6 +14485,8 @@ $as_echo "$as_me: WARNING: MySQL Library
296055
          CPPFLAGS="${CPPFLAGS} -I${with_mysql}/mysql/include"
296055
      elif test -d ${with_mysql}/include; then
296055
          CPPFLAGS="${CPPFLAGS} -I${with_mysql}/include"
296055
+     elif test -d ${prefix}/include/mysql; then
296055
+         CPPFLAGS="${CPPFLAGS} -I${prefix}/include/mysql"
296055
      else
296055
          CPPFLAGS="${CPPFLAGS} -I${with_mysql}"
296055
      fi
296055
@@ -14416,8 +14607,90 @@ LIB_PGSQL=""
296055
 
296055
 case "$with_pgsql" in
296055
     no) true;;
296055
-    notfound) { $as_echo "$as_me:$LINENO: WARNING: PostgreSQL Library not found" >&5
296055
-$as_echo "$as_me: WARNING: PostgreSQL Library not found" >&2;}; true;;
296055
+    notfound)
296055
+     LIB_PGSQL="-lpq"
296055
+     # CPPFLAGS="${CPPFLAGS} -I`pg_config --includedir`"
296055
+     save_LDFLAGS=$LDFLAGS
296055
+     LDFLAGS="$LDFLAGS $LIB_PGSQL"
296055
+     { $as_echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5
296055
+$as_echo_n "checking for PQsetdbLogin in -lpq... " >&6; }
296055
+if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_check_lib_save_LIBS=$LIBS
296055
+LIBS="-lpq  $LIBS"
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+/* Override any GCC internal prototype to avoid an error.
296055
+   Use char because int might match the return type of a GCC
296055
+   builtin and then its argument prototype would still apply.  */
296055
+#ifdef __cplusplus
296055
+extern "C"
296055
+#endif
296055
+char PQsetdbLogin ();
296055
+int
296055
+main ()
296055
+{
296055
+return PQsetdbLogin ();
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext conftest$ac_exeext
296055
+if { (ac_try="$ac_link"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_link") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest$ac_exeext && {
296055
+	 test "$cross_compiling" = yes ||
296055
+	 $as_test_x conftest$ac_exeext
296055
+       }; then
296055
+  ac_cv_lib_pq_PQsetdbLogin=yes
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_lib_pq_PQsetdbLogin=no
296055
+fi
296055
+
296055
+rm -rf conftest.dSYM
296055
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
296055
+      conftest$ac_exeext conftest.$ac_ext
296055
+LIBS=$ac_check_lib_save_LIBS
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetdbLogin" >&5
296055
+$as_echo "$ac_cv_lib_pq_PQsetdbLogin" >&6; }
296055
+if test "x$ac_cv_lib_pq_PQsetdbLogin" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<\_ACEOF
296055
+#define HAVE_PGSQL /**/
296055
+_ACEOF
296055
+
296055
+else
296055
+  { $as_echo "$as_me:$LINENO: WARNING: PostgreSQL Library pq does not work" >&5
296055
+$as_echo "$as_me: WARNING: PostgreSQL Library pq does not work" >&2;}
296055
+          with_pgsql=no
296055
+fi
296055
+
296055
+     LDFLAGS=$save_LDFLAGS
296055
+     ;;
296055
     *)
296055
      if test -d ${with_pgsql}/lib/pgsql; then
296055
 
296055
@@ -14466,6 +14739,8 @@ $as_echo "$as_me: WARNING: PostgreSQL Li
296055
          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
296055
      elif test -d ${with_pgsql}/include; then
296055
          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include"
296055
+     elif test -d ${prefix}/include; then
296055
+         CPPFLAGS="${CPPFLAGS} -I${prefix}/include"
296055
      else
296055
          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}"
296055
      fi
296055
@@ -18166,116 +18441,989 @@ fi
296055
 
296055
 done
296055
 
296055
-ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "
296055
-#ifdef HAVE_INTTYPES_H
296055
-#include <inttypes.h>
296055
-#endif
296055
-"
296055
-if test "x$ac_cv_type_long_long" = xyes; then :
296055
-
296055
-cat >>confdefs.h <<_ACEOF
296055
-#define HAVE_LONG_LONG 1
296055
+{ $as_echo "$as_me:$LINENO: checking for long long" >&5
296055
+$as_echo_n "checking for long long... " >&6; }
296055
+if test "${ac_cv_type_long_long+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_long_long=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
 _ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
 
296055
-
296055
-fi
296055
-ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "
296055
 #ifdef HAVE_INTTYPES_H
296055
 #include <inttypes.h>
296055
 #endif
296055
-"
296055
-if test "x$ac_cv_type_int8_t" = xyes; then :
296055
 
296055
-cat >>confdefs.h <<_ACEOF
296055
-#define HAVE_INT8_T 1
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (long long))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
 _ACEOF
296055
-
296055
-
296055
-fi
296055
-ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "
296055
-#ifdef HAVE_INTTYPES_H
296055
-#include <inttypes.h>
296055
-#endif
296055
-"
296055
-if test "x$ac_cv_type_uint8_t" = xyes; then :
296055
-
296055
-cat >>confdefs.h <<_ACEOF
296055
-#define HAVE_UINT8_T 1
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
 _ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
 
296055
-
296055
-fi
296055
-ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "
296055
 #ifdef HAVE_INTTYPES_H
296055
 #include <inttypes.h>
296055
 #endif
296055
-"
296055
-if test "x$ac_cv_type_int16_t" = xyes; then :
296055
 
296055
-cat >>confdefs.h <<_ACEOF
296055
-#define HAVE_INT16_T 1
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((long long)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
 _ACEOF
296055
-
296055
-
296055
-fi
296055
-ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "
296055
-#ifdef HAVE_INTTYPES_H
296055
-#include <inttypes.h>
296055
-#endif
296055
-"
296055
-if test "x$ac_cv_type_uint16_t" = xyes; then :
296055
-
296055
-cat >>confdefs.h <<_ACEOF
296055
-#define HAVE_UINT16_T 1
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_long_long=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
296055
+$as_echo "$ac_cv_type_long_long" >&6; }
296055
+if test "x$ac_cv_type_long_long" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<_ACEOF
296055
+#define HAVE_LONG_LONG 1
296055
 _ACEOF
296055
 
296055
 
296055
 fi
296055
-ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "
296055
+{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5
296055
+$as_echo_n "checking for int8_t... " >&6; }
296055
+if test "${ac_cv_type_int8_t+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_int8_t=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
 #ifdef HAVE_INTTYPES_H
296055
 #include <inttypes.h>
296055
 #endif
296055
-"
296055
-if test "x$ac_cv_type_int32_t" = xyes; then :
296055
 
296055
-cat >>confdefs.h <<_ACEOF
296055
-#define HAVE_INT32_T 1
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (int8_t))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
 _ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
 
296055
-
296055
-fi
296055
-ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "
296055
 #ifdef HAVE_INTTYPES_H
296055
 #include <inttypes.h>
296055
 #endif
296055
-"
296055
-if test "x$ac_cv_type_uint32_t" = xyes; then :
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((int8_t)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_int8_t=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
296055
+$as_echo "$ac_cv_type_int8_t" >&6; }
296055
+if test "x$ac_cv_type_int8_t" = x""yes; then
296055
 
296055
 cat >>confdefs.h <<_ACEOF
296055
-#define HAVE_UINT32_T 1
296055
+#define HAVE_INT8_T 1
296055
 _ACEOF
296055
 
296055
 
296055
 fi
296055
-ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "
296055
+{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5
296055
+$as_echo_n "checking for uint8_t... " >&6; }
296055
+if test "${ac_cv_type_uint8_t+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_uint8_t=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
 #ifdef HAVE_INTTYPES_H
296055
 #include <inttypes.h>
296055
 #endif
296055
-"
296055
-if test "x$ac_cv_type_int64_t" = xyes; then :
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (uint8_t))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((uint8_t)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_uint8_t=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
296055
+$as_echo "$ac_cv_type_uint8_t" >&6; }
296055
+if test "x$ac_cv_type_uint8_t" = x""yes; then
296055
 
296055
 cat >>confdefs.h <<_ACEOF
296055
-#define HAVE_INT64_T 1
296055
+#define HAVE_UINT8_T 1
296055
 _ACEOF
296055
 
296055
 
296055
 fi
296055
-ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "
296055
+{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
296055
+$as_echo_n "checking for int16_t... " >&6; }
296055
+if test "${ac_cv_type_int16_t+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_int16_t=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
 #ifdef HAVE_INTTYPES_H
296055
 #include <inttypes.h>
296055
 #endif
296055
-"
296055
-if test "x$ac_cv_type_uint64_t" = xyes; then :
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (int16_t))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((int16_t)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_int16_t=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
296055
+$as_echo "$ac_cv_type_int16_t" >&6; }
296055
+if test "x$ac_cv_type_int16_t" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<_ACEOF
296055
+#define HAVE_INT16_T 1
296055
+_ACEOF
296055
+
296055
+
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
296055
+$as_echo_n "checking for uint16_t... " >&6; }
296055
+if test "${ac_cv_type_uint16_t+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_uint16_t=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (uint16_t))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((uint16_t)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_uint16_t=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
296055
+$as_echo "$ac_cv_type_uint16_t" >&6; }
296055
+if test "x$ac_cv_type_uint16_t" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<_ACEOF
296055
+#define HAVE_UINT16_T 1
296055
+_ACEOF
296055
+
296055
+
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
296055
+$as_echo_n "checking for int32_t... " >&6; }
296055
+if test "${ac_cv_type_int32_t+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_int32_t=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (int32_t))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((int32_t)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_int32_t=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
296055
+$as_echo "$ac_cv_type_int32_t" >&6; }
296055
+if test "x$ac_cv_type_int32_t" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<_ACEOF
296055
+#define HAVE_INT32_T 1
296055
+_ACEOF
296055
+
296055
+
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
296055
+$as_echo_n "checking for uint32_t... " >&6; }
296055
+if test "${ac_cv_type_uint32_t+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_uint32_t=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (uint32_t))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((uint32_t)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_uint32_t=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
296055
+$as_echo "$ac_cv_type_uint32_t" >&6; }
296055
+if test "x$ac_cv_type_uint32_t" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<_ACEOF
296055
+#define HAVE_UINT32_T 1
296055
+_ACEOF
296055
+
296055
+
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5
296055
+$as_echo_n "checking for int64_t... " >&6; }
296055
+if test "${ac_cv_type_int64_t+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_int64_t=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (int64_t))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((int64_t)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_int64_t=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
296055
+$as_echo "$ac_cv_type_int64_t" >&6; }
296055
+if test "x$ac_cv_type_int64_t" = x""yes; then
296055
+
296055
+cat >>confdefs.h <<_ACEOF
296055
+#define HAVE_INT64_T 1
296055
+_ACEOF
296055
+
296055
+
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: checking for uint64_t" >&5
296055
+$as_echo_n "checking for uint64_t... " >&6; }
296055
+if test "${ac_cv_type_uint64_t+set}" = set; then
296055
+  $as_echo_n "(cached) " >&6
296055
+else
296055
+  ac_cv_type_uint64_t=no
296055
+cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof (uint64_t))
296055
+       return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  cat >conftest.$ac_ext <<_ACEOF
296055
+/* confdefs.h.  */
296055
+_ACEOF
296055
+cat confdefs.h >>conftest.$ac_ext
296055
+cat >>conftest.$ac_ext <<_ACEOF
296055
+/* end confdefs.h.  */
296055
+
296055
+#ifdef HAVE_INTTYPES_H
296055
+#include <inttypes.h>
296055
+#endif
296055
+
296055
+int
296055
+main ()
296055
+{
296055
+if (sizeof ((uint64_t)))
296055
+	  return 0;
296055
+  ;
296055
+  return 0;
296055
+}
296055
+_ACEOF
296055
+rm -f conftest.$ac_objext
296055
+if { (ac_try="$ac_compile"
296055
+case "(($ac_try" in
296055
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
296055
+  *) ac_try_echo=$ac_try;;
296055
+esac
296055
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
296055
+$as_echo "$ac_try_echo") >&5
296055
+  (eval "$ac_compile") 2>conftest.er1
296055
+  ac_status=$?
296055
+  grep -v '^ *+' conftest.er1 >conftest.err
296055
+  rm -f conftest.er1
296055
+  cat conftest.err >&5
296055
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
296055
+  (exit $ac_status); } && {
296055
+	 test -z "$ac_c_werror_flag" ||
296055
+	 test ! -s conftest.err
296055
+       } && test -s conftest.$ac_objext; then
296055
+  :
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+	ac_cv_type_uint64_t=yes
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+else
296055
+  $as_echo "$as_me: failed program was:" >&5
296055
+sed 's/^/| /' conftest.$ac_ext >&5
296055
+
296055
+
296055
+fi
296055
+
296055
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
296055
+fi
296055
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
296055
+$as_echo "$ac_cv_type_uint64_t" >&6; }
296055
+if test "x$ac_cv_type_uint64_t" = x""yes; then
296055
 
296055
 cat >>confdefs.h <<_ACEOF
296055
 #define HAVE_UINT64_T 1