diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2012-07-19 15:55:41 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2012-07-19 15:55:41 +0200 |
| commit | 0893a90fd7d07d568a4b702b6c607bc406d8cba5 (patch) | |
| tree | 34fc6b78ca25b50cc9308c4dac22a319f4444dc7 | |
| parent | 6aaf15798556b4d6880124ce858f9623e9de570c (diff) | |
| download | mariadb-git-0893a90fd7d07d568a4b702b6c607bc406d8cba5.tar.gz | |
Reverting broken configure/make stuff
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 2a89aea3c70..f4179f5cb47 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ @sql_union_dirs@ unittest \ - @sql_server@ @man_dirs@ tests internal \ + @sql_server@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ mysql-test support-files sql-bench @tools_dirs@ \ win diff --git a/configure.in b/configure.in index 24e46259957..068328992e0 100644 --- a/configure.in +++ b/configure.in @@ -2849,10 +2849,6 @@ if test -d "$srcdir/cmd-line-utils/readline" ; then AC_CONFIG_FILES(cmd-line-utils/readline/Makefile) fi -if test -d "$srcdir/internal" ; then - AC_CONFIG_FILES(internal/Makefile) -fi - AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl unittest/mysys/Makefile unittest/strings/Makefile dnl |