summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2009-08-13 21:43:03 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2009-08-13 21:43:03 +0300
commit6ffef584f46e175b1ae29a1b152316dacc8a08fd (patch)
treeb977ea6c213b6a29ea304fe1bf461a95a8fa6298
parent73fe9290251b13e7e5d978a6bfbe014499f87e36 (diff)
downloadmailutils-6ffef584f46e175b1ae29a1b152316dacc8a08fd.tar.gz
mailutils-6ffef584f46e175b1ae29a1b152316dacc8a08fd.tar.bz2
Further improvements of the configure system.
* Makefile.am (MU_COND_LIBMU_CPP): New cond. (SUBDIRS): Use LIBMU_CPP_DIR * configure.ac: Rename --disable-c++ to --disable-cxx: autoconf cannot handle the former. (MU_COND_LIBMU_CPP): New cond. (AC_CONFIG_FILES): Add include/mailutils/cpp/Makefile * include/mailutils/Makefile.am (nobase_pkginclude_HEADERS): Remove (MU_COND_LIBMU_CPP): New cond. (SUBDIRS): Add CPP_DIR * include/mailutils/cpp/Makefile.am: Remove substitution vars. (cppincludedir, cppinclude_HEADERS): New variables. * include/mailutils/sys/Makefile.am (sysincludedir) (sysinclude_HEADERS): New variables.
-rw-r--r--Makefile.am6
-rw-r--r--configure.ac5
-rw-r--r--include/mailutils/Makefile.am9
-rw-r--r--include/mailutils/cpp/Makefile.am6
-rw-r--r--include/mailutils/sys/Makefile.am4
5 files changed, 19 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index ba37745c5..5cabed2b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,6 +84,10 @@ if MU_COND_LIBMU_SCM
LIBMU_SCM_DIR = libmu_scm
endif
+if MU_COND_LIBMU_CPP
+ LIBMU_CPP_DIR = libmu_cpp
+endif
+
SUBDIRS = \
mu-aux\
include\
@@ -96,7 +100,7 @@ SUBDIRS = \
lib\
libmu_argp\
libmu_cfg\
- libmu_cpp\
+ $(LIBMU_CPP_DIR)\
$(LIBMU_SCM_DIR)\
libmu_sieve\
$(PYTHON_DIR)\
diff --git a/configure.ac b/configure.ac
index f9ddd2e44..02586185d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1141,10 +1141,10 @@ if test "$status_python" = yes; then
fi
AM_CONDITIONAL([MU_COND_PYTHON], [test "$status_python" = yes])
-AC_SUBST(MU_CXX_LTLIBRARIES_BUILD)
AC_SUBST(MU_CXX_EXAMPLES_BUILD)
-MU_ENABLE_SUPPORT(c++,
+MU_ENABLE_SUPPORT(cxx,
[MU_CXX_EXAMPLES_BUILD='$(MU_CXX_EXAMPLES_LIST)'])
+AM_CONDITIONAL([MU_COND_LIBMU_CPP], [test "$mu_cv_enable_cxx" = yes])
# Default mailbox record
# Note: 1. Support for mbox type is always enabled.
@@ -1332,6 +1332,7 @@ AC_CONFIG_FILES([
include/Makefile
include/mailutils/Makefile
include/mailutils/sys/Makefile
+ include/mailutils/cpp/Makefile
lib/Makefile
libmu_argp/Makefile
libmu_auth/Makefile
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index b38f23900..3ffda2645 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -98,8 +98,9 @@ pkginclude_HEADERS = \
vartab.h\
version.h
-nobase_pkginclude_HEADERS = \
- sys/nntp.h\
- sys/pop3.h
-SUBDIRS = sys
+if MU_COND_LIBMU_CPP
+ CPP_DIR = cpp
+endif
+
+SUBDIRS = sys $(CPP_DIR)
diff --git a/include/mailutils/cpp/Makefile.am b/include/mailutils/cpp/Makefile.am
index 69c15b639..443897224 100644
--- a/include/mailutils/cpp/Makefile.am
+++ b/include/mailutils/cpp/Makefile.am
@@ -16,7 +16,8 @@
## along with GNU Mailutils; if not, write to the Free Software
## Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-MU_CXX_INCLUDES = \
+cppincludedir=$(pkgincludedir)/cpp
+cppinclude_HEADERS = \
address.h\
attribute.h\
body.h\
@@ -41,6 +42,3 @@ MU_CXX_INCLUDES = \
sieve.h\
stream.h\
url.h
-
-pkginclude_HEADERS = @MU_CXX_INCLUDES@
-EXTRA_HEADERS = '$(MU_CXX_INCLUDES)'
diff --git a/include/mailutils/sys/Makefile.am b/include/mailutils/sys/Makefile.am
index 59d3c1894..75aab6609 100644
--- a/include/mailutils/sys/Makefile.am
+++ b/include/mailutils/sys/Makefile.am
@@ -17,3 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
+sysincludedir=$(pkgincludedir)/sys
+sysinclude_HEADERS = \
+ nntp.h\
+ pop3.h

Return to:

Send suggestions and report system problems to the System administrator.