Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 3f06cbfb 3f06cbfbe3d554304860be4373a2e124c8e1af1e by Sergey Poznyakoff
Options

Bugfix

1 parent 1c161cd1
Inline Side-by-side
Showing 1 changed file with 19 additions and 1 deletions
...@@ -27,6 +27,7 @@ AC_PREREQ(2.59) ...@@ -27,6 +27,7 @@ AC_PREREQ(2.59)
27 27
28 dnl Check for programs 28 dnl Check for programs
29 AC_PROG_CC 29 AC_PROG_CC
30 AC_PROG_CXX
30 AC_PROG_INSTALL 31 AC_PROG_INSTALL
31 AC_PROG_LN_S 32 AC_PROG_LN_S
32 AC_LIBTOOL_DLOPEN 33 AC_LIBTOOL_DLOPEN
...@@ -429,7 +430,7 @@ AH_TEMPLATE(HAVE_MYSQL,[Define if you have libmysql]) ...@@ -429,7 +430,7 @@ AH_TEMPLATE(HAVE_MYSQL,[Define if you have libmysql])
429 AH_TEMPLATE(HAVE_PGSQL,[Define if you have libpq]) 430 AH_TEMPLATE(HAVE_PGSQL,[Define if you have libpq])
430 431
431 if test x"$use_mysql" = x"yes" -a x"$use_postgres" = x"yes"; then 432 if test x"$use_mysql" = x"yes" -a x"$use_postgres" = x"yes"; then
432 AC_MSG_ERROR(Use either --with-mysql or --with-postgres, not both) 433 AC_MSG_ERROR([Use either --with-mysql or --with-postgres, not both])
433 else 434 else
434 if test x"$use_mysql" = x"yes"; then 435 if test x"$use_mysql" = x"yes"; then
435 AC_CHECK_HEADER(mysql/mysql.h, 436 AC_CHECK_HEADER(mysql/mysql.h,
...@@ -683,6 +684,18 @@ if test x"$useguile" = x"yes"; then ...@@ -683,6 +684,18 @@ if test x"$useguile" = x"yes"; then
683 ],[useguile=no]) 684 ],[useguile=no])
684 fi 685 fi
685 686
687 dnl Check whether to enable C++ support
688 if test -z "$CXX"; then
689 :
690 else
691 AC_SUBST(MU_CXX_LIBS)
692 AC_SUBST(MU_CXX_PROGS)
693 AC_SUBST(MU_CXX_INCLUDES)
694 MU_CXX_LIBS='$(MU_CXX_LIBS)'
695 MU_CXX_PROGS='$(MU_CXX_PROGS)'
696 MU_CXX_INCLUDES='$(MU_CXX_INCLUDES)'
697 fi
698
686 dnl Check for Emacs site-lisp directory 699 dnl Check for Emacs site-lisp directory
687 AM_PATH_LISPDIR 700 AM_PATH_LISPDIR
688 701
...@@ -756,6 +769,11 @@ AC_CONFIG_FILES([Makefile ...@@ -756,6 +769,11 @@ AC_CONFIG_FILES([Makefile
756 include/mailutils/sys/Makefile 769 include/mailutils/sys/Makefile
757 intl/Makefile 770 intl/Makefile
758 lib/Makefile 771 lib/Makefile
772 libmu_cpp/Makefile
773 libmu_cpp/examples/Makefile
774 libmu_cpp/include/Makefile
775 libmu_cpp/include/mailutils/Makefile
776 libmu_cpp/include/mailutils/c++/Makefile
759 libmu_scm/Makefile 777 libmu_scm/Makefile
760 libsieve/Makefile 778 libsieve/Makefile
761 libsieve/extensions/Makefile 779 libsieve/extensions/Makefile
......