From bec420768ec448efc6375a6a0ad13a3389efef48 Mon Sep 17 00:00:00 2001
From: glenux <glenux@eaee96b3-f302-0410-b096-c6cfd47f7835>
Date: Tue, 14 Aug 2012 22:15:18 +0000
Subject: [PATCH] cryptaffinity: remove dependecy towards readline.

git-svn-id: https://websvn.glenux.net/svn/Upoc/cryptaffinity/trunk@1740 eaee96b3-f302-0410-b096-c6cfd47f7835
---
 configure.in          | 111 ++++++++++++++----------------------------
 src/tools/Makefile.am |   3 +-
 2 files changed, 38 insertions(+), 76 deletions(-)

diff --git a/configure.in b/configure.in
index c386d0e..05f96cb 100644
--- a/configure.in
+++ b/configure.in
@@ -73,36 +73,14 @@ dnl ***************************************************************************
 dnl Gettext stuff.
 dnl ***************************************************************************
 
-#GETTEXT_PACKAGE=yalag-0.1
-#AC_SUBST(GETTEXT_PACKAGE)
-#AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-
-#ALL_LINGUAS="fr"
-#AM_GLIB_GNU_GETTEXT
-
-
 dnl Check for programs
 
 dnl Check for build configuration.
-#AC_PROG_INTLTOOL
 
 AM_PROG_LIBTOOL
 
 dnl Checks for header files.
 
-#AC_MSG_NOTICE([checking presence of SQLite])
-#AC_CHECK_HEADERS([sqlite.h],[],
-#	[
-#	AC_MSG_NOTICE([*** Please install/upgrade SQLite before proceeding])
-#	AC_MSG_NOTICE([*** with Unlost Memories installation.])
-#	AC_MSG_ERROR([cannot find sqlite.h])
-#	])
-	
-#sqlite_deps="sqlite3 >= 3.0"
-#PKG_CHECK_MODULES(SQLITE3,$sqlite_deps,build_sqlite=yes,build_sqlite=no)
-#AC_SUBST(SQLITE3_CFLAGS)
-#AC_SUBST(SQLITE3_LIBS)
-
 glib_deps="glib-2.0 >= 2.0"
 PKG_CHECK_MODULES(GLIB2,$glib_deps,	build_glib=yes, build_glib=no)
 AC_SUBST(GLIB2_CFLAGS)
@@ -111,60 +89,43 @@ AC_SUBST(GLIB2_LIBS)
 ##########
 # Figure out where to get the READLINE header files.
 #
-AC_MSG_CHECKING([readline header files])
-found=no
-if test "$config_TARGET_READLINE_INC" != ""; then
-  TARGET_READLINE_INC=$config_TARGET_READLINE_INC
-  found=yes
-fi
-if test "$found" = "yes"; then
-  AC_MSG_RESULT($TARGET_READLINE_INC)
-else
-  AC_MSG_RESULT(not specified: still searching...)
-  AC_CHECK_HEADER(readline.h, [found=yes])
-fi
-if test "$found" = "no"; then
-  for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
-    AC_CHECK_FILE($dir/include/readline.h, found=yes)
-    if test "$found" = "yes"; then
-      TARGET_READLINE_INC="-I$dir/include"
-      break
-    fi
-    AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
-    if test "$found" = "yes"; then
-      TARGET_READLINE_INC="-I$dir/include/readline"
-      break
-    fi
-  done
-fi
-if test "$found" = "yes"; then
-  if test "$TARGET_READLINE_LIBS" = ""; then
-    TARGET_HAVE_READLINE=0
-  else
-    TARGET_HAVE_READLINE=1
-  fi
-else
-  TARGET_HAVE_READLINE=0
-fi
-AC_SUBST(TARGET_READLINE_INC)
-AC_SUBST(TARGET_HAVE_READLINE)
-
-#libxml2_deps="libxml-2.0 >= 2.4.1"
-#PKG_CHECK_MODULES(LIBXML2,$libxml2_deps, build_libxml2=yes, build_libxml2=no)
-#AC_SUBST(LIBXML2_CFLAGS)
-#AC_SUBST(LIBXML2_LIBS)
-
-#if test $build_libxml2 == yes ; then
-#  AC_DEFINE(HAVE_LIBXML2_H,1,[Vaut 1 lorsque l'on utilise LIBXML2.])
-#else
-#  AC_DEFINE(HAVE_LIBXML2_H,0,[Vaut 1 lorsque l'on utilise LIBXML2.])
+#AC_MSG_CHECKING([readline header files])
+#found=no
+#if test "$config_TARGET_READLINE_INC" != ""; then
+#  TARGET_READLINE_INC=$config_TARGET_READLINE_INC
+#  found=yes
 #fi
-
-#libxmlpp_deps="libxml++-2.6 >= 2.8"
-#PKG_CHECK_MODULES(LIBXMLPP,$libxmlpp_deps, build_libxmlpp=yes, build_libxmlpp=no)
-#AC_SUBST(LIBXMLPP_CFLAGS)
-#AC_SUBST(LIBXMLPP_LIBS)
-
+#if test "$found" = "yes"; then
+#  AC_MSG_RESULT($TARGET_READLINE_INC)
+#else
+#  AC_MSG_RESULT(not specified: still searching...)
+#  AC_CHECK_HEADER(readline.h, [found=yes])
+#fi
+#if test "$found" = "no"; then
+#  for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
+#    AC_CHECK_FILE($dir/include/readline.h, found=yes)
+#    if test "$found" = "yes"; then
+#      TARGET_READLINE_INC="-I$dir/include"
+#      break
+#    fi
+#    AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
+#    if test "$found" = "yes"; then
+#      TARGET_READLINE_INC="-I$dir/include/readline"
+#      break
+#    fi
+#  done
+#fi
+#if test "$found" = "yes"; then
+#  if test "$TARGET_READLINE_LIBS" = ""; then
+#    TARGET_HAVE_READLINE=0
+#  else
+#    TARGET_HAVE_READLINE=1
+#  fi
+#else
+#  TARGET_HAVE_READLINE=0
+#fi
+#AC_SUBST(TARGET_READLINE_INC)
+#AC_SUBST(TARGET_HAVE_READLINE)
 
 AC_CONFIG_FILES([Makefile 
 		doc/Makefile
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 0e62905..3cf8138 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -22,7 +22,8 @@ break_afinity_SOURCES += ba_cmd.hh breakafinity.hh breakafinity_global.hh breaka
 #	miniftp_proto.hh \
 #	server_msg.hh
 
-INCLUDES= 	-I../lib/ -I./ @GLIB2_CFLAGS@ @TARGET_READLINE_INC@
+#INCLUDES= 	-I../lib/ -I./ @GLIB2_CFLAGS@ @TARGET_READLINE_INC@
+INCLUDES= 	-I../lib/ -I./ @GLIB2_CFLAGS@ 
 
 #BUILT_SOURCES = source_parser.h source_lexer.cc