diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-06-09 13:58:40 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-06-09 13:58:40 +0000 |
| commit | 8df809e4ce2319cccd91b14a74e13c879faaf357 (patch) | |
| tree | 0e9db6cc192c09b12ceef9ae4760b17eb36e8493 /libraries | |
| parent | 7434fb5be86c7cc59c520dc07dc96b27b4fb1406 (diff) | |
| download | haskell-8df809e4ce2319cccd91b14a74e13c879faaf357.tar.gz | |
Move readline configuration into the readline package
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/Makefile | 6 | ||||
| -rw-r--r-- | libraries/configure.ac | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index cc4ee0f935..618916e510 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -9,7 +9,7 @@ include $(TOP)/mk/boilerplate.mk # want the Makefile. MFLAGS += -f Makefile -SUBDIRS = base haskell98 template-haskell +SUBDIRS = base haskell98 template-haskell readline ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -43,10 +43,6 @@ SUBDIRS += $(wildcard ObjectIO) endif endif -ifeq "$(GhcLibsWithReadline)" "YES" -SUBDIRS += $(wildcard readline) -endif - # ----------------------------------------------------------------------------- DIST_CLEAN_FILES += config.cache config.status diff --git a/libraries/configure.ac b/libraries/configure.ac index fe6cc33718..0551d86fb3 100644 --- a/libraries/configure.ac +++ b/libraries/configure.ac @@ -2,6 +2,6 @@ AC_INIT([Haskell hierarchical libraries], [1.0], [libraries@haskell.org], [libraries]) AC_CONFIG_SRCDIR([libraries-footer.txt]) -AC_CONFIG_SUBDIRS([base network unix X11 HGL OpenGL GLUT OpenAL ALUT time]) +AC_CONFIG_SUBDIRS([base network unix X11 HGL OpenGL GLUT OpenAL ALUT time readline]) AC_OUTPUT |