mirror of
https://github.com/matrix-construct/construct
synced 2024-12-25 23:14:13 +01:00
Rip out libltdl.
This commit is contained in:
parent
5aeeb73e20
commit
12c836dc6e
7 changed files with 0 additions and 26 deletions
|
@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
|
|||
|
||||
SUBDIRS = include/rb
|
||||
SUBDIRS += include/ircd
|
||||
if BUILD_LTDL
|
||||
SUBDIRS += libltdl
|
||||
endif
|
||||
SUBDIRS += rb
|
||||
SUBDIRS += ircd
|
||||
SUBDIRS += charybdis
|
||||
|
@ -32,7 +29,6 @@ mrproper-local:
|
|||
rm -f depcomp
|
||||
rm -f ltmain.sh
|
||||
rm -f install-sh
|
||||
rm -rf libltdl
|
||||
rm -f libtool
|
||||
rm -f missing
|
||||
rm -f ylwrap
|
||||
|
@ -46,7 +42,6 @@ mrproper-local:
|
|||
rm -f m4/argz.m4
|
||||
rm -f m4/libtool.m4
|
||||
rm -f m4/ltargz.m4
|
||||
rm -f m4/ltdl.m4
|
||||
rm -f m4/ltoptions.m4
|
||||
rm -f m4/ltsugar.m4
|
||||
rm -f m4/ltversion.m4
|
||||
|
|
|
@ -2,7 +2,6 @@ prefix = @prefix@
|
|||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
@LTDLINCL@ \
|
||||
@BOOST_CPPFLAGS@
|
||||
|
||||
AM_LDFLAGS = \
|
||||
|
@ -22,5 +21,4 @@ charybdis_SOURCES = \
|
|||
charybdis_LDADD = \
|
||||
-lircd \
|
||||
-lrb \
|
||||
@LIBLTDL@ \
|
||||
@BOOST_LIBS@
|
||||
|
|
12
configure.ac
12
configure.ac
|
@ -9,7 +9,6 @@ AC_INIT([charybdis], [5-dev])
|
|||
AC_GNU_SOURCE
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CONFIG_AUX_DIR([libltdl/config])
|
||||
AC_PREFIX_DEFAULT($HOME/ircd)
|
||||
|
||||
AC_PATH_PROG(AUTOMAKE, automake)
|
||||
|
@ -35,9 +34,6 @@ AC_LANG(C++)
|
|||
AC_CONFIG_HEADER(include/rb/config.h)
|
||||
AX_CXX_COMPILE_STDCXX([14], [gnu], [mandatory], 201300)
|
||||
|
||||
LT_CONFIG_LTDL_DIR([libltdl])
|
||||
LTDL_INIT([subproject])
|
||||
|
||||
AC_PROG_YACC
|
||||
dnl AC_PROG_YACC defaults to yacc unconditionally if nothing can be found
|
||||
if test "$YACC" = "yacc" -a -z "`which $YACC 2>/dev/null`"; then
|
||||
|
@ -772,13 +768,6 @@ dnl Third party
|
|||
dnl
|
||||
|
||||
|
||||
dnl
|
||||
dnl ltdl support
|
||||
dnl
|
||||
|
||||
AM_CONDITIONAL([BUILD_LTDL], [[[ "$with_included_ltdl" = "yes" ]]])
|
||||
|
||||
|
||||
|
||||
dnl
|
||||
dnl boost support
|
||||
|
@ -1290,7 +1279,6 @@ echo "Configuration time ................ $RB_DATESTR"
|
|||
echo "Compiler .......................... $CXX"
|
||||
echo "Compiler flags (CXXFLAGS) ......... $CXXFLAGS"
|
||||
echo "Building boost .................... $with_included_boost"
|
||||
echo "Building libltdl .................. $with_included_ltdl"
|
||||
echo "Precompiled headers ............... $build_pch"
|
||||
echo "Developer debug ................... $debug"
|
||||
echo "IPv6 support ...................... $ipv6"
|
||||
|
|
|
@ -2,7 +2,6 @@ extensiondir=@moduledir@
|
|||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
$(LTDLINCL) \
|
||||
@BOOST_CPPFLAGS@ \
|
||||
-include $(top_srcdir)/include/ircd/ircd.h
|
||||
|
||||
|
@ -26,7 +25,6 @@ AM_LDFLAGS += \
|
|||
AM_LDFLAGS += \
|
||||
-lircd \
|
||||
-lrb \
|
||||
@LIBLTDL@ \
|
||||
@BOOST_LIBS@
|
||||
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@ AM_YFLAGS = -d
|
|||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
@LTDLINCL@ \
|
||||
@BOOST_CPPFLAGS@ \
|
||||
-include ircd/ircd.h
|
||||
|
||||
|
@ -32,7 +31,6 @@ libircd_LTLIBRARIES = libircd.la
|
|||
|
||||
libircd_la_LIBADD = \
|
||||
-lrb \
|
||||
@LIBLTDL@ \
|
||||
@BOOST_LIBS@
|
||||
|
||||
libircd_la_SOURCES = \
|
||||
|
|
|
@ -2,7 +2,6 @@ moduledir=@moduledir@
|
|||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
$(LTDLINCL) \
|
||||
@BOOST_CPPFLAGS@ \
|
||||
-include $(top_srcdir)/include/ircd/ircd.h \
|
||||
-include $(top_srcdir)/include/ircd/mapi.h
|
||||
|
@ -25,7 +24,6 @@ AM_LDFLAGS += \
|
|||
AM_LDFLAGS += \
|
||||
-lircd \
|
||||
-lrb \
|
||||
@LIBLTDL@ \
|
||||
@BOOST_LIBS@
|
||||
|
||||
#m_ban_la_SOURCES = m_ban.cc
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
@LTDLINCL@ \
|
||||
@BOOST_CPPFLAGS@
|
||||
|
||||
AM_LDFLAGS = \
|
||||
|
|
Loading…
Reference in a new issue