3 @@ -40,8 +40,8 @@ if test "$OSTYPE" = "$OSREL" ; then
7 -AC_DEFINE_UNQUOTED(PR_BUILD_OPTS, "`echo "$ac_configure_args"`")
8 -AC_DEFINE_UNQUOTED(PR_PLATFORM, $platform)
9 +AC_DEFINE_UNQUOTED(PR_BUILD_OPTS, "`echo "$ac_configure_args"`", [.])
10 +AC_DEFINE_UNQUOTED(PR_PLATFORM, $platform, [.])
14 @@ -278,7 +278,7 @@ AC_ARG_WITH(lastlog,
17 if test -n "$pr_lastlog_path" ; then
18 - AC_DEFINE_UNQUOTED(PR_LASTLOG_PATH, "`eval echo "$pr_lastlog_path"`")
19 + AC_DEFINE_UNQUOTED(PR_LASTLOG_PATH, "`eval echo "$pr_lastlog_path"`", [.])
23 @@ -522,15 +522,6 @@ AC_ARG_ENABLE(dso,
26 AC_DEFINE(PR_USE_DSO, 1, [Define if using DSO support.])
28 - dnl Run configure scripts in subdirectories
29 - LT_CONFIG_LTDL_DIR([lib/libltdl])
30 - LTDL_INIT([convenience])
32 - dnl Even though this macro is deprecated, we need to use it to
33 - dnl specifically tell ltdl that it is NOT to use any system directories,
34 - dnl and ONLY to use this bundled location.
35 - LTDL_CONVENIENCE([lib/libltdl])
39 @@ -802,9 +793,9 @@ AC_ARG_ENABLE(scoreboard-updates,
41 if test x"$enableval" = xyes || test x"$enableval" = xno ; then
42 AC_MSG_WARN(scoreboard updates defaulting to 10)
43 - AC_DEFINE_UNQUOTED(PR_TUNABLE_XFER_SCOREBOARD_UPDATES, 10)
44 + AC_DEFINE_UNQUOTED(PR_TUNABLE_XFER_SCOREBOARD_UPDATES, 10, [.])
46 - AC_DEFINE_UNQUOTED(PR_TUNABLE_XFER_SCOREBOARD_UPDATES, $enableval)
47 + AC_DEFINE_UNQUOTED(PR_TUNABLE_XFER_SCOREBOARD_UPDATES, $enableval, [.])
51 @@ -1027,13 +1018,13 @@ if test x"$force_shadow" != xno ; then
52 AC_DEFINE(PR_USE_SHADOW, 1, [Define if using shadow password support.])
54 AC_CHECK_MEMBER(struct spwd.sp_warn,
55 - [AC_DEFINE(HAVE_SPWD_SP_WARN)],,
56 + [AC_DEFINE(HAVE_SPWD_SP_WARN, 1, [.])],,
57 [#include <shadow.h>])
58 AC_CHECK_MEMBER(struct spwd.sp_inact,
59 - [AC_DEFINE(HAVE_SPWD_SP_INACT)],,
60 + [AC_DEFINE(HAVE_SPWD_SP_INACT, 1, [.])],,
61 [#include <shadow.h>])
62 AC_CHECK_MEMBER(struct spwd.sp_expire,
63 - [AC_DEFINE(HAVE_SPWD_SP_EXPIRE)],,
64 + [AC_DEFINE(HAVE_SPWD_SP_EXPIRE, 1, [.])],,
65 [#include <shadow.h>])
68 @@ -2266,19 +2257,19 @@ pr_saved_exec_prefix="$exec_prefix"
69 test "x$prefix" = xNONE && prefix=$ac_default_prefix
70 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
72 -AC_DEFINE_UNQUOTED(PR_CONFIG_DIR, "`eval echo "${sysconfdir}"`")
73 -AC_DEFINE_UNQUOTED(PR_INCLUDE_DIR, "`eval echo "${includedir}"`")
74 -AC_DEFINE_UNQUOTED(PR_LIBEXEC_DIR, "`eval echo "${libexecdir}"`")
75 +AC_DEFINE_UNQUOTED(PR_CONFIG_DIR, "`eval echo "${sysconfdir}"`", [.])
76 +AC_DEFINE_UNQUOTED(PR_INCLUDE_DIR, "`eval echo "${includedir}"`", [.])
77 +AC_DEFINE_UNQUOTED(PR_LIBEXEC_DIR, "`eval echo "${libexecdir}"`", [.])
79 dnl We evaluate the string twice. Once to go from $datadir to $prefix/share,
80 dnl and once more to substitute in the $prefix value. What a pain.
81 locale_dir="`eval echo ${localedir}`"
82 locale_dir="`eval echo ${locale_dir}`"
83 -AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
84 +AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [.])
86 -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`")
87 -AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
88 -AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`")
89 +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [.])
90 +AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [.])
91 +AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [.])
93 prefix="$pr_saved_prefix"
94 exec_prefix="$pr_saved_exec_prefix"
95 @@ -2328,11 +2319,11 @@ if test "$OSTYPE" = "-DDARWIN6" -o "$OST
98 my_cflags="\"$CFLAGS\""
99 -AC_DEFINE_UNQUOTED(PR_BUILD_CFLAGS, $my_cflags)
100 +AC_DEFINE_UNQUOTED(PR_BUILD_CFLAGS, $my_cflags, [.])
101 my_ldflags="\"$LDFLAGS $LIBDIRS\""
102 -AC_DEFINE_UNQUOTED(PR_BUILD_LDFLAGS, $my_ldflags)
103 +AC_DEFINE_UNQUOTED(PR_BUILD_LDFLAGS, $my_ldflags, [.])
104 my_libs="\"$LIBRARIES $LIBS\""
105 -AC_DEFINE_UNQUOTED(PR_BUILD_LIBS, $my_libs)
106 +AC_DEFINE_UNQUOTED(PR_BUILD_LIBS, $my_libs, [.])
108 dnl And finally, generate the appropriate Make* and config.h
113 +sinclude(m4/proftpd.m4)
115 +++ b/lib/libltdl/acinclude.m4
117 +sinclude(m4/argz.m4)
118 +sinclude(m4/libtool.m4)
119 +sinclude(m4/ltversion.m4)
120 +sinclude(m4/ltsugar.m4)
121 +sinclude(m4/ltoptions.m4)
122 +sinclude(m4/ltdl.m4)
123 +sinclude(m4/lt~obsolete.m4)
124 --- a/lib/libltdl/Makefile.am
125 +++ b/lib/libltdl/Makefile.am
126 @@ -50,19 +50,7 @@ AM_LDFLAGS += -no-undefined
127 LTDL_VERSION_INFO = -version-info 9:0:2
129 noinst_LTLIBRARIES += $(LT_DLLOADERS)
132 -ltdlincludedir = $(includedir)/libltdl
133 -ltdlinclude_HEADERS = libltdl/lt_system.h \
134 - libltdl/lt_error.h \
135 - libltdl/lt_dlloader.h
136 -include_HEADERS += ltdl.h
137 -lib_LTLIBRARIES += libltdl.la
141 noinst_LTLIBRARIES += libltdlc.la
144 libltdl_la_SOURCES = libltdl/lt__alloc.h \
145 libltdl/lt__dirent.h \