From 6b3454376eee8f81f023f91dc982c5d40f48e76f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Garc=C3=ADa?= <jjgarcia@zentyal.com>
Date: Thu, 16 Apr 2015 09:55:22 +0200
Subject: [PATCH] Revert "configure: Fix gnulib/crypto/md4 dependency"

This reverts commit f0a3fdae5bdfa242d8b4a6b01025195c0eb4a620.
---
 SoObjects/SOGo/.gitignore           |  2 --
 SoObjects/SOGo/GNUmakefile.preamble |  2 --
 configure                           | 39 -----------------------------
 3 files changed, 43 deletions(-)
 delete mode 100644 SoObjects/SOGo/.gitignore

diff --git a/SoObjects/SOGo/.gitignore b/SoObjects/SOGo/.gitignore
deleted file mode 100644
index 8fa5151fd..000000000
--- a/SoObjects/SOGo/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-config.h
-md4.c
diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index 8a484d3a1..b7456f8bd 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -30,8 +30,6 @@ SOGo_LIBRARIES_DEPEND_UPON += \
 ifeq ($(HAS_LIBRARY_gnutls),yes)
 ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
 SOGo_LIBRARIES_DEPEND_UPON += -lgnutls
-ADDITIONAL_INCLUDE_DIRS += -I$(GNULIB_INCLUDE)
-SOGo_C_FILES += $(GNULIB_FILES)
 else
 ifeq ($(HAS_LIBRARY_ssl),yes)
 ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
diff --git a/configure b/configure
index 0a3acdc06..94d933fe7 100755
--- a/configure
+++ b/configure
@@ -374,41 +374,6 @@ EOF
   return $LINK_RESULT
 }
 
-
-# gnulib requires autoconf https://www.gnu.org/software/gnulib/manual/html_node/Initial-import.html
-# We only require crypyo/md4 module (no dependencies, two files) when using gnutls
-# Workaround: copy manually the files to the project needed (md4.c)
-# Really ugly but it works, glad to change this to better alternative.
-gnulib_dir=/usr/share/gnulib/lib
-
-checkGnulib() {
-  if test ! -d $gnulib_dir; then
-    echo "When using --with-ssl=gnutls option gnulib package is required to be installed in $gnulib_dir"
-    exit 1
-  fi
-  cfgwrite "GNULIB_INCLUDE := $gnulib_dir"
-}
-
-gnulibMd4() {
-  local source_files="md4.c"
-  local local_gnulib_dir="SoObjects/SOGo"
-
-  for source_file in $source_files; do
-    if test -f $gnulib_dir/$source_file; then
-      cp $gnulib_dir/$source_file $local_gnulib_dir
-    else
-      echo "Error with gnulib file $source_file, gnulib package not installed?"
-      exit 1
-    fi
-  done
-
-  # md4.c requires config.h, create empty one
-  touch $local_gnulib_dir/config.h
-
-  cfgwrite "GNULIB_FILES := $source_files"
-}
-# End of gnulib stuff
-
 checkDependencies() {
   cfgwrite "BASE_LIBS := `gnustep-config --base-libs`"
   if test "x$ARG_ENABLE_SAML2" = "x1"; then
@@ -424,15 +389,11 @@ checkDependencies() {
       checkLinking "ssl"     optional;
       if test $? != 0; then
           checkLinking "gnutls"  optional;
-          checkGnulib
-          gnulibMd4
       fi;
   elif test "x$ARG_CFGSSL" = "xssl"; then
       checkLinking "ssl"     required;
   elif test "x$ARG_CFGSSL" = "xgnutls"; then
       checkLinking "gnutls"  required;
-      checkGnulib
-      gnulibMd4
   fi
 }