-// $Id: ChangeLog,v 1.156 2008/01/09 23:05:53 kewlio Exp $ //
+// $Id: ChangeLog,v 1.157 2008/04/16 15:25:46 danielaustin Exp $ //
+
+2008-04-16 Dan-m00 <daniel@undernet.org>
+ * configure.ac: Removed boost requirement for chanfix, altered
+ output for for ./configure script and tidied up old
+ leftover configure code.
+ * configure:
+ * libltdl/acinclude.m4:
+ * */Makefile.in: Rebuilt configure/make system
2008-01-09 Dan-m00 <daniel@undernet.org>
* mod.cservice/PURGECommand: check global and channel lists for
#! /bin/sh
-# From configure.ac Revision: 1.40 .
+# From configure.ac Revision: 1.41 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
_ACEOF
-
CXXFLAGS="$tmpcxxflags"
CPPFLAGS="$tmpcppflags"
LIBS="$tmplibs"
-
-
-
-
# Check whether --with-log4cplus was given.
if test "${with_log4cplus+set}" = set; then
withval=$with_log4cplus; check_log4cplus=$withval
done
fi
-if test $build_modopenchanfix = true; then
- if test "x$threadLib" = "x"; then
- { { echo "$as_me:$LINENO: error: mod.openchanfix requires THREAD support - which you lack." >&5
-echo "$as_me: error: mod.openchanfix requires THREAD support - which you lack." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test "x$BOOST_THREAD_LIB" = "x"; then
- { { echo "$as_me:$LINENO: error: mod.openchanfix requires Boost::Thread support - which you lack." >&5
-echo "$as_me: error: mod.openchanfix requires Boost::Thread support - which you lack." >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
-
if test $build_modccontrol = true; then
COND_MODCCONTROL_TRUE=
COND_MODCCONTROL_FALSE='#'
fi
-echo
-echo Configuration has been finished, and everything seems to be all right.
-echo Now, you have the chance to modify include/gnuworld_config.h to set your
-echo preferred options...
-echo
+echo ""
+echo "##########################"
+echo "# GNUWorld Configuration #"
+echo "##########################"
+echo ""
+echo "Configuration of GNUWorld is complete - you're almost ready to run 'make'..."
+echo ""
+echo "Check the following files for modification before building:"
+echo " include/gnuworld_config.h"
+
+if test $build_modcservice = true; then
+ echo " mod.cservice/cservice_config.h"
+fi
+
+if test $build_modopenchanfix = true; then
+ echo " mod.openchanfix/chanfix_config.h"
+fi
+
+echo ""
+
-dnl $Id: configure.ac,v 1.41 2007/10/31 14:56:36 kewlio Exp $
+dnl $Id: configure.ac,v 1.42 2008/04/16 15:25:49 danielaustin Exp $
dnl ----------------------------------------------------------
echo Configuring GNUWorld...
echo
-AC_REVISION($Revision: 1.41 $)
+AC_REVISION($Revision: 1.42 $)
AC_INIT
AC_CONFIG_SRCDIR([src/main.cc])
AM_INIT_AUTOMAKE(gnuworld,3.0)
AC_CHECK_HEADER([libpq-fe.h])
AC_DEFINE([HAVE_PGSQL],[],[Using PostGreSQL])
-dnl [pgsql_includedir="."],
-dnl AC_MSG_FAILURE([Unable to find libpq-fe.h, please install
-dnl PostGreSQL]),[])
-
dnl Everything seemed to work, pgsql located.
dnl Restore the original CXXFLAGS and LIBS. The db library will
dnl link against pgsql_lib (which is empty if using system default),
CPPFLAGS="$tmpcppflags"
LIBS="$tmplibs"
-dnl pgsql_lib="$pgsql_home/lib"
-dnl AC_ARG_WITH(pgsql-lib,
-dnl AC_HELP_STRING([--with-pgsql-lib=PGSQLLIBDIR],
-dnl [Specify location to find libpq.so, default is \
-dnl /usr/local/lib/pgsql/lib]),
-dnl [pgsql_lib=$withval]
-dnl )
-
-dnl pgsql_include="$pgsql_home/include"
-dnl AC_ARG_WITH(pgsql-include,
-dnl AC_HELP_STRING([--with-pgsql-include=PGSQLINCLUDEDIR],
-dnl [Specify location to find libpq-fe.h, default is \
-dnl /usr/local/lib/pgsql/include]),
-dnl [pgsql_include=$withval]
-dnl )
-
-dnl AC_MSG_CHECKING([for libpq.so in $pgsql_lib])
-dnl if [ test -f $pgsql_lib/libpq.so ]; then
-dnl AC_MSG_RESULT([$pgsql_lib])
-dnl AC_DEFINE([HAVE_PGSQL],[],[Using PostGreSQL])
-dnl [LDFLAGS="$LDFLAGS -L${pgsql_lib}"]
-dnl else
-dnl AC_MSG_FAILURE([unable to find libpq.so])
-dnl fi
-
-dnl AC_MSG_CHECKING([for libpq-fe.h])
-dnl if [ test -f $pgsql_include/libpq-fe.h ]; then
-dnl AC_MSG_RESULT([$pgsql_include])
-dnl AC_DEFINE([HAVE_PGSQL],[],[Using PostGreSQL])
-dnl CXXFLAGS="${CXXFLAGS} -I${pgsql_include}"
-dnl else
-dnl AC_MSG_FAILURE([unable to find libpq-fe.h])
-dnl fi
-
dnl Enable log4cplus if required
AC_ARG_WITH(log4cplus,
AC_HELP_STRING([--with-log4cplus],
done
fi
-dnl Check if openchanfix is selected. mod.openchanfix requires threading
-dnl support - if we don't have it, tell the user so they can fix it.
-if [test $build_modopenchanfix = true]; then
- if [test "x$threadLib" = "x"]; then
- AC_MSG_ERROR(mod.openchanfix requires THREAD support - which you lack.)
- fi
- if [test "x$BOOST_THREAD_LIB" = "x"]; then
- AC_MSG_ERROR(mod.openchanfix requires Boost::Thread support - which you lack.)
- fi
-fi
-
AM_CONDITIONAL(COND_MODCCONTROL,[test $build_modccontrol = true])
AM_CONDITIONAL(COND_MODCHANFIX,[test $build_modchanfix = true])
AM_CONDITIONAL(COND_MODCLIENTEXAMPLE,[test $build_modclientExample = true])
AC_OUTPUT
-echo
-echo Configuration has been finished, and everything seems to be all right.
-echo Now, you have the chance to modify include/gnuworld_config.h to set your
-echo preferred options...
-echo
+echo ""
+echo "##########################"
+echo "# GNUWorld Configuration #"
+echo "##########################"
+echo ""
+echo "Configuration of GNUWorld is complete - you're almost ready to run 'make'..."
+echo ""
+echo "Check the following files for modification before building:"
+echo " include/gnuworld_config.h"
+
+if [test $build_modcservice = true]; then
+ echo " mod.cservice/cservice_config.h"
+fi
+
+if [test $build_modopenchanfix = true]; then
+ echo " mod.openchanfix/chanfix_config.h"
+fi
+
+echo ""
+
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
# macro and use it instead. #
+ freebsd*)
+ libltdl_cv_sys_dlopen_deplibs=yes
+ ;;
############################################################
# LT_AC_PROG_SED
# --------------
# If you are looking for one http://www.opendarwin.org/projects/dlcompat
libltdl_cv_sys_dlopen_deplibs=yes
;;
- freebsd*)
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
freebsd* | dragonfly*)
libltdl_cv_sys_dlopen_deplibs=yes
;;
@SET_MAKE@
-# "$Id: Makefile.in,v 1.235 2007/10/31 14:56:38 kewlio Exp $"
+# "$Id: Makefile.in,v 1.236 2008/04/16 15:25:50 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.194 2007/10/31 14:56:39 kewlio Exp $"
+# "$Id: Makefile.in,v 1.195 2008/04/16 15:25:51 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.193 2007/10/31 14:56:43 kewlio Exp $"
+# "$Id: Makefile.in,v 1.194 2008/04/16 15:25:51 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.247 2007/10/31 14:56:43 kewlio Exp $"
+# "$Id: Makefile.in,v 1.248 2008/04/16 15:25:52 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.196 2007/10/31 14:56:44 kewlio Exp $"
+# "$Id: Makefile.in,v 1.197 2008/04/16 15:25:53 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.105 2007/10/31 14:56:44 kewlio Exp $"
+# "$Id: Makefile.in,v 1.106 2008/04/16 15:25:53 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.15 2008/01/16 02:03:38 buzlip01 Exp $"
+# "$Id: Makefile.in,v 1.16 2008/04/16 15:25:54 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.99 2007/10/31 14:56:44 kewlio Exp $"
+# "$Id: Makefile.in,v 1.100 2008/04/16 15:25:54 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.30 2007/10/31 14:56:44 kewlio Exp $"
+# "$Id: Makefile.in,v 1.31 2008/04/16 15:25:55 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@SET_MAKE@
-# "$Id: Makefile.in,v 1.194 2007/10/31 14:56:45 kewlio Exp $"
+# "$Id: Makefile.in,v 1.195 2008/04/16 15:25:55 danielaustin Exp $"
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@