--- rpl/Attic/configure.in	2010/04/07 13:44:59	1.17
+++ rpl/Attic/configure.in	2010/04/17 18:57:33	1.18
@@ -245,16 +245,7 @@ fi
 if test ! -d "$srcdir"/tools/$FILE; then
 	gunzip -c "$srcdir"/tools/$FILE.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf - )
-	TMP=$(mktemp)
 	(cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1)
-	sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > $TMP
-	sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \
-		sed 's/^file_/rplfile_/g' > \
-		"$srcdir"/tools/$FILE/src/Makefile.am
-	sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > $TMP
-	\mv -f $TMP "$srcdir"/tools/$FILE/magic/Makefile.am
-	(cd "$srcdir"/tools/$FILE && libtoolize --copy --force \
-		&& aclocal && automake -af && autoconf);
 fi
 if test ! -d "$srcdir"/tools/$ICONV; then
 	gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \
@@ -269,26 +260,6 @@ if test ! -d tools/$OPENSSL; then
 			(cd tools && tar -xf -)
 fi
 
-AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no)
-if test "$LIBTOOLIZE" = "no"; then
-	AC_MSG_ERROR([Cannot find libtoolize! You have to install it.])
-fi
-
-AC_CHECK_PROG(ACLOCAL, aclocal, yes, no)
-if test "$ACLOCAL" = "no"; then
-	AC_MSG_ERROR([Cannot find aclocal! You have to install it.])
-fi
-
-AC_CHECK_PROG(AUTOMAKE, automake, yes, no)
-if test "$AUTOMAKE" = "no"; then
-	AC_MSG_ERROR([Cannot find automake! You have to install it.])
-fi
-
-AC_CHECK_PROG(AUTOCONF, autoconf, yes, no)
-if test "$AUTOCONF" = "no"; then
-	AC_MSG_ERROR([Cannot find autoconf! You have to install it.])
-fi
-
 dnl Default installation directory
 AC_PREFIX_DEFAULT(/usr/local)
 
@@ -762,14 +733,16 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \
 		strerror strspn strstr strtod)
 
+ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared"
+
 AC_CONFIG_SUBDIRS(tools/$NCURSES)
 AC_CONFIG_SUBDIRS(tools/$READLINE)
-AC_CONFIG_SUBDIRS(tools/$UNITS)
 AC_CONFIG_SUBDIRS(tools/$GSL)
 AC_CONFIG_SUBDIRS(tools/$GPP)
 AC_CONFIG_SUBDIRS(tools/$FILE)
 AC_CONFIG_SUBDIRS(tools/$ICONV)
 AC_CONFIG_SUBDIRS(tools/$SQLITE)
+AC_CONFIG_SUBDIRS(tools/$UNITS)
 
 dnl Check for OpenSSL os/comp
 AC_ARG_WITH(openssl_arch,
@@ -860,7 +833,32 @@ else
 	LIBMTMALLOC=
 fi
 
+case $(OS) in
+
+    Darwin)
+		EXPORT_DYNAMIC=-flat_namespace
+		NESTED_FUNCTIONS=-fnested-functions
+		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
+	break ;;
+
+	Cygwin)
+		EXPORT_DYNAMIC=--export-all-symbols
+		NESTED_FUNCTIONS=
+		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+	break ;;
+
+    *)
+		EXPORT_DYNAMIC=--export-dynamic
+		NESTED_FUNCTIONS=
+		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+	break ;;
+
+esac
+
 AC_SUBST(LIBMTMALLOC)
+AC_SUBST(EXPORT_DYNAMIC)
+AC_SUBST(NESTED_FUNCTIONS)
+AC_SUBST(SEMAPHORES_NOMMES)
 
 AC_SUBST(NCURSES)
 AC_SUBST(READLINE)