Remove remaining custom macros, folding them into configure.in.in.

Each was called only once.

4 files changed, 0 insertions, 98 deletions

diff --git a/conf/m4/plptools/PLP_CHECK_INTL.m4 b/conf/m4/plptools/PLP_CHECK_INTL.m4
deleted file mode 100644
index 4dfdf33..0000000
--- a/conf/m4/plptools/PLP_CHECK_INTL.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-AC_DEFUN([PLP_CHECK_INTL],[
-	if test "${USE_NLS}" = "yes" ; then
-		if test "${USE_INCLUDED_LIBINTL}" = "yes" ; then
-			plp_have_bind_textdomain_codeset=no
-		else
-			AC_CHECK_LIB(c, bind_textdomain_codeset,
-				plp_have_bind_textdomain_codeset=yes,
-				plp_have_bind_textdomain_codeset=no)
-		fi
-		if test "${plp_have_bind_textdomain_codeset}" = yes ; then
-			AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET)
-		fi
-	fi
-])
-
diff --git a/conf/m4/plptools/PLP_CHECK_READLINE.m4 b/conf/m4/plptools/PLP_CHECK_READLINE.m4
deleted file mode 100644
index df4e8d8..0000000
--- a/conf/m4/plptools/PLP_CHECK_READLINE.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-dnl
-dnl Check for libreadline and if it is available, check if it
-dnl depends on libcurses. (Normally, it silently resolves the
-dnl following symbols from libtermcap:
-dnl   tgetnum, tgoto, tgetflag, tputs, tgetent, BC, PC, UP
-dnl On RedHat 7.0 however, libtermcap is broken: It contains no
-dnl symbols at all. Fortunately, libcurses provides the same
-dnl and therefore we have to check for that special case.)
-dnl
-AC_DEFUN([PLP_CHECK_READLINE],
-[
-	AC_MSG_CHECKING(for readline in -lreadline)
-	ac_cv_readline_libs=""
-	rl_desc="Define this, if you have libreadline"
-	saved_libs=$LIBS
-	LIBS="$LIBS -lreadline"
-	l1ok=0
-	l2ok=0
-	l3ok=0
-	l4ok=0
-	AC_TRY_LINK(,[extern char *readline(void); readline();],l1ok=1)
-	LIBS="$saved_LIBS -lreadline -ltermcap"
-	AC_TRY_LINK(,[extern char *readline(void); readline();],l2ok=1)
-	LIBS="$saved_LIBS -lreadline -lcurses"
-	AC_TRY_LINK(,[extern char *readline(void); readline();],l3ok=1)
-	LIBS="$saved_LIBS -lreadline -lncurses"
-	AC_TRY_LINK(,[extern char *readline(void); readline();],l4ok=1)
-	LIBS="$saved_LIBS"
-	case "$l1ok$l2ok$l3ok$l4ok" in
-		0000)
-			AC_MSG_RESULT(no)
-			;;
-		01*)
-			dnl We prefer libtermcap cause it's smaller
-			ac_cv_readline_libs="-lreadline -ltermcap"
-			AC_MSG_RESULT([yes, and needs libtermcap])
-			;;
-		001*)
-			dnl Prefer libcurses over libncurses
-			ac_cv_readline_libs="-lreadline -lcurses"
-			AC_MSG_RESULT([yes, and needs libcurses])
-			;;
-		0001)
-			ac_cv_readline_libs="-lreadline -lncurses"
-			AC_MSG_RESULT([yes, and needs libncurses])
-			;;
-		1*)
-			ac_cv_readline_libs="-lreadline"
-			AC_MSG_RESULT(yes)
-			;;
-	esac
-	LIBREADLINE="${ac_cv_readline_libs}"
-	AC_SUBST(LIBREADLINE)
-	if test "${ac_cv_readline_libs}" != "" ; then
-		AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE,1,$rl_desc)
-	fi
-])
diff --git a/conf/m4/plptools/PLP_FIND_FILE.m4 b/conf/m4/plptools/PLP_FIND_FILE.m4
deleted file mode 100644
index 5de64e4..0000000
--- a/conf/m4/plptools/PLP_FIND_FILE.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl
-dnl Select first existing file from a list of given files
-dnl Usage:
-dnl   PLP_FIND_FILE(filea fileb filec, FOUND)
-dnl
-dnl On return, variable FOUND is set to one of fileX or to NO, if none
-dnl was found.
-dnl
-AC_DEFUN([PLP_FIND_FILE],[
-	$2=NO
-	for i in $1; do
-		if test -r "$i" ; then
-			$2=$i
-			break 2
-		fi
-	done
-])
diff --git a/conf/m4/plptools/PLP_SET_LIBVERSION.m4 b/conf/m4/plptools/PLP_SET_LIBVERSION.m4
deleted file mode 100644
index 3f1e8a4..0000000
--- a/conf/m4/plptools/PLP_SET_LIBVERSION.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_DEFUN([PLP_SET_LIBVERSION],
-	[
-		AC_REQUIRE([AM_INIT_AUTOMAKE])
-		maj=$(echo ${VERSION} | cut -d. -f1)
-		min=$(echo ${VERSION} | cut -d. -f2)
-		LIBVERSION=${maj}:${min}:${maj}
-		AC_SUBST(LIBVERSION)
-	]
-)