Ticket #51970: patch-configure.ac.diff

configure.ac

@@ -288 +288 @@
 AC_MSG_CHECKING(for signed 64-bit type)
 INT64_T='none'
 INT64_FORMAT='none'
-if test $ac_cv_sizeof_signed_long -eq 8
-then
-  INT64_T='signed long'
-  INT64_FORMAT='"%ld"'
-elif test $ac_cv_sizeof_signed_long_long -eq 8
+if test $ac_cv_sizeof_signed_long_long -eq 8
 then
   INT64_T='signed long long'
   case "${host_os}" in
@@ -304 +300 @@
       INT64_FORMAT='"%lld"'
       ;;
   esac
+elif test $ac_cv_sizeof_signed_long -eq 8
+then
+  INT64_T='signed long'
+  INT64_FORMAT='"%ld"'
 fi
 
 
@@ -314 +314 @@
 AC_MSG_CHECKING(for unsigned 64-bit type)
 UINT64_T='none'
 UINT64_FORMAT='none'
-if test $ac_cv_sizeof_unsigned_long -eq 8
-then
-  UINT64_T='unsigned long'
-  UINT64_FORMAT='"%lu"'
-elif test $ac_cv_sizeof_unsigned_long_long -eq 8
+if test $ac_cv_sizeof_unsigned_long_long -eq 8
 then
   UINT64_T='unsigned long long'
   case "${host_os}" in
@@ -330 +326 @@
       UINT64_FORMAT='"%llu"'
       ;;
   esac
+elif test $ac_cv_sizeof_unsigned_long -eq 8
+then
+  UINT64_T='unsigned long'
+  UINT64_FORMAT='"%lu"'
 fi
 AC_MSG_RESULT($UINT64_T)
 AC_DEFINE_UNQUOTED(TIFF_UINT64_T,$UINT64_T,[Unsigned 64-bit type])
@@ -893 +893 @@
 dnl AX_CHECK_GLUT sets GLUT_CFLAGS & GLUT_LIBS
 AX_CHECK_GLUT
 
-if test "$no_x" != "yes" -a "$no_gl" != "yes" \
+if test "$no_gl" != "yes" \
         -a "$no_glu" != "yes" -a "$no_glut" != "yes" ; then
   HAVE_OPENGL=yes
 fi