[PATCH 09/21] Simplify the conditional inclusion of the contrib directory.

[John Darrington]

* Makefile.in, configure.ac: Ensure that CONTRIB is correctly
  included (or not) when building outside the source tree.
---
 Makefile.in  |    4 ++--
 configure.ac |   10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d6bad91..637141d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -620,13 +620,13 @@ include $(GLSRCDIR)/ijs.mak
 @LCUPSINCLUDE@
 @LCUPSIINCLUDE@
 include $(GLSRCDIR)/devs.mak
-include $(GLSRCDIR)/contrib.mak
address@hidden@ $(GLSRCDIR)/contrib.mak
address@hidden@ $(CONTRIBDIR)/contrib.mak
 include $(GLSRCDIR)/unix-aux.mak
 include $(GLSRCDIR)/unixlink.mak
 include $(GLSRCDIR)/unix-dll.mak
 include $(GLSRCDIR)/unix-end.mak
 include $(GLSRCDIR)/unixinst.mak
address@hidden@
 @CUPSINCLUDE@
 
 # Clean up after the autotools scripts
diff --git a/configure.ac b/configure.ac
index e351afd..4b89c19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,7 @@ dnl --------------------------------------------------
 
 AC_ARG_ENABLE([contrib], AC_HELP_STRING([--disable-contrib],
     [Do not include contributed drivers]))
-CONTRIBINCLUDE="include contrib/contrib.mak"
+CONTRIBINCLUDE="include"
 INSTALL_CONTRIB="install-contrib-extras"
 
 case `uname` in
@@ -150,16 +150,10 @@ case `uname` in
       AC_MSG_WARN([disabling contrib devices])
       enable_contrib=no
     ;;
-    *)
-#     This is just an arbitrary file in contrib to check
-      if !(test -f contrib/gdevbjc_.c); then
-        enable_contrib=no
-      fi
-    ;;
 esac
 
 if test x$enable_contrib = xno; then
-    CONTRIBINCLUDE=""
+    CONTRIBINCLUDE="#"
     INSTALL_CONTRIB=""
     CFLAGS="$CFLAGS -DNOCONTRIB"
 fi
-- 
1.7.10.4