diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 32 |
2 files changed, 8 insertions, 29 deletions
@@ -1,3 +1,8 @@ +2007-09-28 Michael Hutchinson <mhutchinson@novell.com> + + * configure.in: Remove xsp/xsp2 checks for ASP.NET project addin and + gcc/g++/ctags checks for C/C++ addin. + 2007-09-27 Raja R Harinath <rharinath@novell.com> * contrib/log4net/Makefile.am (LOG4NET_CSFILES): Don't prepend diff --git a/configure.in b/configure.in index 166ac3690b..55b2434dd6 100644 --- a/configure.in +++ b/configure.in @@ -225,18 +225,12 @@ AM_CONDITIONAL(ENABLE_MYSQL, [test "x$enable_mysql" = "xyes"]) AM_CONDITIONAL(ENABLE_SQLITE, [test "x$enable_sqlite" = "xyes"]) AM_CONDITIONAL(ENABLE_SQLSERVER, [test "x$enable_sqlserver" = "xyes"]) -dnl ASP.NET project addin -XSP_VERSION=0.1 -XSP2_VERSION=0.2 +# ASP.NET project addin AC_ARG_ENABLE(aspnet, AC_HELP_STRING([--enable-aspnet], [enable ASP.NET project support [default=yes]]), enable_aspnet=${enableval}, enable_aspnet=yes) -if test "x$enable_aspnet" = "xyes"; then - PKG_CHECK_MODULES(XSP, xsp >= $XSP_VERSION xsp-2 >= $XSP2_VERSION) -fi - AM_CONDITIONAL(ENABLE_ASPNET, [test x$enable_aspnet = xyes]) #We need to know where Mozilla is for launch scripts and possible for AspNetEdit @@ -328,28 +322,8 @@ fi AM_CONDITIONAL(MOZILLA_EXTENSION_TYPE_TEXTFILE, test -f "$MOZILLA_HOME/chrome/installed-chrome.txt") AM_CONDITIONAL(ENABLE_ASPNETEDIT, test x$enable_aspnetedit = xyes) -dnl C/C++ project addin -GCC_VERSION=4.1.2 -CTAGS_VERSION=5.5 -AC_ARG_ENABLE(c, AC_HELP_STRING([--enable-c], [enable C/C++ project support [default=no]]), enable_c=yes, enable_c=no) - -if test "x$enable_c" = "xyes"; then - AC_PATH_PROG(GCC, gcc) - if test "x$GCC" = "x"; then - AC_MSG_ERROR([Please install gcc version $GCC_VERSION or later.]) - fi - - AC_PATH_PROG(GPP, g++) - if test "x$GPP" = "x"; then - AC_MSG_WARN([Without g++ ($GCC_VERSION or later) you won't be able to compile C++ projects.]) - fi - - AC_PATH_PROG(CTAGS, ctags) - if test "x$CTAGS" = "x"; then - AC_MSG_WARN([Without ctags you won't get class pad and completion support for C/C++ projects.]) - fi -fi - +# C/C++ project addin +AC_ARG_ENABLE(c, AC_HELP_STRING([--enable-c], [enable C/C++ project support [default=yes]]), enable_c=${enableval}, enable_c=yes) AM_CONDITIONAL(ENABLE_C, [test x$enable_c = xyes]) AC_ARG_ENABLE(update-mimedb, |