@@ -23,15 +23,12 @@ AC_PROG_CC
23
23
AC_PROG_CXX
24
24
AC_PROG_MKDIR_P
25
25
AC_PROG_INSTALL
26
- # AC_PROG_YACC
27
26
AM_PROG_AR
28
- # AM_PROG_LEX
29
27
30
28
LT_INIT()
31
29
LT_LANG([ C++] )
32
30
33
31
AC_CONFIG_MACRO_DIR ( [ m4] )
34
- # AC_CONFIG_HEADERS(src/include/ultrabus/config.h src/include/ultrabus/ultrabus_config.hpp)
35
32
AM_SILENT_RULES ([ yes] )
36
33
37
34
#
@@ -88,29 +85,6 @@ AC_SUBST([iomultiplex_CFLAGS])
88
85
AC_SUBST ( [ iomultiplex_LIBS] )
89
86
90
87
91
- #
92
- # Give the user an option to not build utilities
93
- #
94
- AC_ARG_ENABLE ( [ utils] ,
95
- [ AS_HELP_STRING ( [ --disable-utils] , [ don't build utilities] ) ] )
96
- AM_CONDITIONAL([ ENABLE_UTILS_SET] , [ test "x$enable_utils" != "xno"] )
97
-
98
- AM_COND_IF([ ENABLE_UTILS_SET] ,
99
- [
100
- # Check for libxml2, used to parse dbus introspect data
101
- PKG_CHECK_MODULES([ libxml2] ,
102
- [ libxml-2.0] ,
103
- [ AM_CONDITIONAL([ HAVE_LIBXML2] , true)] ,
104
- [ AC_MSG_WARN ( Could not find libxml2 - dbus-tool will not format introspect output ) ;
105
- AM_CONDITIONAL([ HAVE_LIBXML2] , false)] )
106
- AC_SUBST ( [ libxml2_CFLAGS] )
107
- AC_SUBST ( [ libxml2_LIBS] )
108
- ] ,
109
- [ AM_CONDITIONAL([ HAVE_LIBXML2] , false)]
110
- )
111
-
112
-
113
-
114
88
#
115
89
# Give the user an option to build example applications
116
90
#
@@ -163,7 +137,6 @@ AC_CONFIG_FILES([
163
137
Makefile
164
138
src/Makefile
165
139
src/ultrabus.pc
166
- utils/Makefile
167
140
examples/Makefile
168
141
doc/Makefile
169
142
] )
@@ -179,15 +152,6 @@ AC_MSG_NOTICE([])
179
152
AC_MSG_NOTICE ( [ Configuration summary:] )
180
153
AC_MSG_NOTICE ( [ ] )
181
154
AC_MSG_NOTICE ( [ Installation prefix.................. ${prefix}] )
182
- AM_COND_IF([ ENABLE_UTILS_SET] ,
183
- [
184
- AM_COND_IF([ HAVE_LIBXML2] ,
185
- [ AC_MSG_NOTICE ( [ Build utilities...................... yes] ) ] ,
186
- [ AC_MSG_NOTICE ( [ Build utilities...................... yes (libxml2 not found - dbus-tool will not format introspect output)] ) ]
187
- )
188
- ] ,
189
- [ AC_MSG_NOTICE ( [ Build utilities...................... no] ) ]
190
- )
191
155
AM_COND_IF([ HAVE_DOXYGEN] ,
192
156
[ AC_MSG_NOTICE ( [ Generate doxygen documentation....... yes] ) ] ,
193
157
[ AC_MSG_NOTICE ( [ Generate doxygen documentation....... no] ) ]
0 commit comments