diff --git a/configure b/configure
index 2c0e7970aa..baf5559ac2 100755
--- a/configure
+++ b/configure
@@ -21885,8 +21885,6 @@ if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then :
   JBIG_LINK=" -ljbig"
 fi
 
-else
-    ac_configure_args="$ac_configure_args --disable-jbig"
 fi
 
 
@@ -22123,6 +22121,7 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst
         if test "$wxUSE_LIBJPEG" = "no"; then
                                                                                     ac_configure_args="$ac_configure_args --disable-jpeg"
         fi
+                        ac_configure_args="$ac_configure_args --disable-jbig"
 
 
 subdirs="$subdirs src/tiff"
diff --git a/configure.in b/configure.in
index 5c82a9c1e6..8928ffe038 100644
--- a/configure.in
+++ b/configure.in
@@ -2629,8 +2629,6 @@ dnl ------------------------------------------------------------------------
 JBIG_LINK=
 if test "$wxUSE_LIBJBIG" = "yes"; then
     AC_CHECK_LIB(jbig, jbg_dec_init, JBIG_LINK=" -ljbig")
-else
-    ac_configure_args="$ac_configure_args --disable-jbig"
 fi
 
 dnl ------------------------------------------------------------------------
@@ -2710,6 +2708,9 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
             dnl we need to hack around this
             ac_configure_args="$ac_configure_args --disable-jpeg"
         fi
+        dnl We don't provide a built-in version of the libjbig library, so
+        dnl disable it for the builtin libtiff.
+        ac_configure_args="$ac_configure_args --disable-jbig"
         AC_CONFIG_SUBDIRS([src/tiff])
     fi
 fi