File tree 5 files changed +121
-54
lines changed
5 files changed +121
-54
lines changed Original file line number Diff line number Diff line change @@ -34,6 +34,9 @@ added support for the sharing limit messages (619/620)
34
34
modified level() to update the db for registered accounts so that level
35
35
changes are persistent across logins
36
36
37
+ added AM_MAINTAINER_MODE macro to configure.in to disable the maintener
38
+ rules in the genereate Makefile
39
+
37
40
Changes from 0.10
38
41
=================
39
42
added max_connections config variable
Original file line number Diff line number Diff line change @@ -58,6 +58,7 @@ NORMAL_UNINSTALL = :
58
58
PRE_UNINSTALL = :
59
59
POST_UNINSTALL = :
60
60
CC = @CC@
61
+ MAINT = @MAINT@
61
62
MAKEINFO = @MAKEINFO@
62
63
MYSQLINCDIR = @MYSQLINCDIR@
63
64
MYSQLLIBDIR = @MYSQLLIBDIR@
@@ -126,19 +127,19 @@ OBJECTS = $(opennap_OBJECTS) $(metaserver_OBJECTS)
126
127
all : all-redirect
127
128
.SUFFIXES :
128
129
.SUFFIXES : .S .c .o .s
129
- $(srcdir ) /Makefile.in : Makefile.am $(top_srcdir ) /configure.in $(ACLOCAL_M4 )
130
+ $(srcdir ) /Makefile.in : @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir ) /configure.in $(ACLOCAL_M4 )
130
131
cd $(top_srcdir ) && $(AUTOMAKE ) --gnu Makefile
131
132
132
133
Makefile : $(srcdir ) /Makefile.in $(top_builddir ) /config.status $(BUILT_SOURCES )
133
134
cd $(top_builddir ) \
134
135
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL ) ./config.status
135
136
136
- $(ACLOCAL_M4 ) : configure.in
137
+ $(ACLOCAL_M4 ) : @MAINTAINER_MODE_TRUE@ configure.in
137
138
cd $(srcdir ) && $(ACLOCAL )
138
139
139
140
config.status : $(srcdir ) /configure $(CONFIG_STATUS_DEPENDENCIES )
140
141
$(SHELL ) ./config.status --recheck
141
- $(srcdir ) /configure : $(srcdir ) /configure.in $(ACLOCAL_M4 ) $(CONFIGURE_DEPENDENCIES )
142
+ $(srcdir ) /configure : @MAINTAINER_MODE_TRUE@ $(srcdir ) /configure.in $(ACLOCAL_M4 ) $(CONFIGURE_DEPENDENCIES )
142
143
cd $(srcdir ) && $(AUTOCONF )
143
144
144
145
mostlyclean-binPROGRAMS :
Original file line number Diff line number Diff line change @@ -102,6 +102,39 @@ else
102
102
fi
103
103
AC_SUBST ( $1 ) ] )
104
104
105
+ # Add --enable-maintainer-mode option to configure.
106
+ # From Jim Meyering
107
+
108
+ # serial 1
109
+
110
+ AC_DEFUN ( AM_MAINTAINER_MODE ,
111
+ [ AC_MSG_CHECKING ( [ whether to enable maintainer-specific portions of Makefiles] )
112
+ dnl maintainer-mode is disabled by default
113
+ AC_ARG_ENABLE ( maintainer-mode ,
114
+ [ --enable-maintainer-mode enable make rules and dependencies not useful
115
+ (and sometimes confusing) to the casual installer] ,
116
+ USE_MAINTAINER_MODE=$enableval ,
117
+ USE_MAINTAINER_MODE=no )
118
+ AC_MSG_RESULT ( $USE_MAINTAINER_MODE )
119
+ AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
120
+ MAINT=$MAINTAINER_MODE_TRUE
121
+ AC_SUBST ( MAINT ) dnl
122
+ ]
123
+ )
124
+
125
+ # Define a conditional.
126
+
127
+ AC_DEFUN ( AM_CONDITIONAL ,
128
+ [ AC_SUBST ( $1 _TRUE )
129
+ AC_SUBST ( $1 _FALSE )
130
+ if $2 ; then
131
+ $1 _TRUE=
132
+ $1 _FALSE='#'
133
+ else
134
+ $1 _TRUE='#'
135
+ $1 _FALSE=
136
+ fi] )
137
+
105
138
106
139
# serial 1
107
140
You can’t perform that action at this time.
0 commit comments