Attachment #680488 for bug #762823

View | Details | Raw Unified | Return to bug 762823
Collapse All | Expand All





# Ensure that if a builtin is chosen only one is built
BUILTIN_MODULE=
if test x$WITH_GLIB = xbuiltin; then
  BUILTIN_MODULE=glib
  WITH_LIBEV=no
  WITH_LIBEVENT=no
  WITH_TEVENT=no
elif test x$WITH_LIBEV = xbuiltin; then
  BUILTIN_MODULE=libev
  WITH_LIBGLIB=no
  WITH_LIBEVENT=no
  WITH_TEVENT=no
elif test x$WITH_LIBEVENT = xbuiltin; then
  BUILTIN_MODULE=libevent
  WITH_LIBGLIB=no
  WITH_LIBEV=no
  WITH_TEVENT=no
elif test x$WITH_TEVENT = xbuiltin; then
  BUILTIN_MODULE=tevent
  WITH_GLIB=no
  WITH_LIBEV=no

fi

# Ensure that there is only one default (convert duplicate default to yes)
if test x$WITH_GLIB = xdefault; then
  AC_DEFINE([DEFUALT_MODULE], [glib])
  test x$WITH_LIBEV    = xdefault && WITH_LIBEV=yes
  test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
  test x$WITH_TEVENT   = xdefault && WITH_TEVENT=yes
fi
if test x$WITH_LIBEV = xdefault; then
  AC_DEFINE([DEFUALT_MODULE], [libev])
  test x$WITH_LIBGLIB  = xdefault && WITH_GLIB=yes
  test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
  test x$WITH_TEVENT   = xdefault && WITH_TEVENT=yes
fi
if test x$WITH_LIBEVENT = xdefault; then
  AC_DEFINE([DEFUALT_MODULE], [libevent])
  test x$WITH_GLIB     = xdefault && WITH_GLIB=yes
  test x$WITH_LIBEV    = xdefault && WITH_LIBEV=yes
  test x$WITH_TEVENT   = xdefault && WITH_TEVENT=yes
fi
if test x$WITH_TEVENT = xdefault; then
  AC_DEFINE([DEFUALT_MODULE], [tevent])
  test x$WITH_GLIB     = xdefault && WITH_GLIB=yes
  test x$WITH_LIBEV    = xdefault && WITH_LIBEV=yes
  test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
fi

BUILD_GLIB=no

if test x$WITH_GLIB != xno; then
  PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB],
                    [test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")])
  if test x$BUILD_GLIB = xauto; then
    BUILD_GLIB=yes
  fi
fi

    ),
    [test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")]
  )
  if test x$BUILD_LIBEV = xauto; then
    BUILD_LIBEV=yes
  fi
fi

if test x$WITH_LIBEVENT != xno; then
  PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT],
                    [test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")])
  if test x$BUILD_LIBEVENT = xauto; then
    BUILD_LIBEVENT=yes
  fi
fi

if test x$WITH_TEVENT != xno; then
  PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT],
                    [test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")])
  if test x$BUILD_TEVENT = xauto; then
    BUILD_TEVENT=yes
  fi
fi

AM_CONDITIONAL([MODULE_GLIB],      [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB     != xno])
AM_CONDITIONAL([MODULE_LIBEV],     [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV    != xno])
AM_CONDITIONAL([MODULE_LIBEVENT],  [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno])
AM_CONDITIONAL([MODULE_TEVENT],    [test x$BUILTIN_MODULE = x && test x$BUILD_TEVENT   != xno])
AM_CONDITIONAL([BUILTIN_GLIB],     [test x$BUILTIN_MODULE = xglib])
AM_CONDITIONAL([BUILTIN_LIBEV],    [test x$BUILTIN_MODULE = xlibev])
AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent])
AM_CONDITIONAL([BUILTIN_TEVENT],   [test x$BUILTIN_MODULE = xtevent])

AC_MSG_NOTICE()
AC_MSG_NOTICE([BUILD CONFIGURATION])

Return to bug 762823

Lines 91-112 AC_ARG_WITH([tevent], Link Here

(-)a/configure.ac.orig (-32 / +32 lines)
91		91
92	# Ensure that if a builtin is chosen only one is built	92	# Ensure that if a builtin is chosen only one is built
93	BUILTIN_MODULE=	93	BUILTIN_MODULE=
94	if test x$WITH_GLIB == xbuiltin; then	94	if test x$WITH_GLIB = xbuiltin; then
95	BUILTIN_MODULE=glib	95	BUILTIN_MODULE=glib
96	WITH_LIBEV=no	96	WITH_LIBEV=no
97	WITH_LIBEVENT=no	97	WITH_LIBEVENT=no
98	WITH_TEVENT=no	98	WITH_TEVENT=no
99	elif test x$WITH_LIBEV == xbuiltin; then	99	elif test x$WITH_LIBEV = xbuiltin; then
100	BUILTIN_MODULE=libev	100	BUILTIN_MODULE=libev
101	WITH_LIBGLIB=no	101	WITH_LIBGLIB=no
102	WITH_LIBEVENT=no	102	WITH_LIBEVENT=no
103	WITH_TEVENT=no	103	WITH_TEVENT=no
104	elif test x$WITH_LIBEVENT == xbuiltin; then	104	elif test x$WITH_LIBEVENT = xbuiltin; then
105	BUILTIN_MODULE=libevent	105	BUILTIN_MODULE=libevent
106	WITH_LIBGLIB=no	106	WITH_LIBGLIB=no
107	WITH_LIBEV=no	107	WITH_LIBEV=no
108	WITH_TEVENT=no	108	WITH_TEVENT=no
109	elif test x$WITH_TEVENT == xbuiltin; then	109	elif test x$WITH_TEVENT = xbuiltin; then
110	BUILTIN_MODULE=tevent	110	BUILTIN_MODULE=tevent
111	WITH_GLIB=no	111	WITH_GLIB=no
112	WITH_LIBEV=no	112	WITH_LIBEV=no
Lines 118-146 if test x$BUILTIN_MODULE != x; then Link Here
118	fi	118	fi
119		119
120	# Ensure that there is only one default (convert duplicate default to yes)	120	# Ensure that there is only one default (convert duplicate default to yes)
121	if test x$WITH_GLIB == xdefault; then	121	if test x$WITH_GLIB = xdefault; then
122	AC_DEFINE([DEFUALT_MODULE], [glib])	122	AC_DEFINE([DEFUALT_MODULE], [glib])
123	test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes	123	test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes
124	test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes	124	test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
125	test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes	125	test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes
126	fi	126	fi
127	if test x$WITH_LIBEV == xdefault; then	127	if test x$WITH_LIBEV = xdefault; then
128	AC_DEFINE([DEFUALT_MODULE], [libev])	128	AC_DEFINE([DEFUALT_MODULE], [libev])
129	test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes	129	test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes
130	test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes	130	test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
131	test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes	131	test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes
132	fi	132	fi
133	if test x$WITH_LIBEVENT == xdefault; then	133	if test x$WITH_LIBEVENT = xdefault; then
134	AC_DEFINE([DEFUALT_MODULE], [libevent])	134	AC_DEFINE([DEFUALT_MODULE], [libevent])
135	test x$WITH_GLIB == xdefault && WITH_GLIB=yes	135	test x$WITH_GLIB = xdefault && WITH_GLIB=yes
136	test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes	136	test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes
137	test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes	137	test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes
138	fi	138	fi
139	if test x$WITH_TEVENT == xdefault; then	139	if test x$WITH_TEVENT = xdefault; then
140	AC_DEFINE([DEFUALT_MODULE], [tevent])	140	AC_DEFINE([DEFUALT_MODULE], [tevent])
141	test x$WITH_GLIB == xdefault && WITH_GLIB=yes	141	test x$WITH_GLIB = xdefault && WITH_GLIB=yes
142	test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes	142	test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes
143	test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes	143	test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
144	fi	144	fi
145		145
146	BUILD_GLIB=no	146	BUILD_GLIB=no
Lines 151-157 BUILD_TEVENT=no Link Here
151	if test x$WITH_GLIB != xno; then	151	if test x$WITH_GLIB != xno; then
152	PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB],	152	PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB],
153	[test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")])	153	[test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")])
154	if test x$BUILD_GLIB == xauto; then	154	if test x$BUILD_GLIB = xauto; then
155	BUILD_GLIB=yes	155	BUILD_GLIB=yes
156	fi	156	fi
157	fi	157	fi
Lines 165-171 if test x$WITH_LIBEV != xno; then Link Here
165	),	165	),
166	[test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")]	166	[test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")]
167	)	167	)
168	if test x$BUILD_LIBEV == xauto; then	168	if test x$BUILD_LIBEV = xauto; then
169	BUILD_LIBEV=yes	169	BUILD_LIBEV=yes
170	fi	170	fi
171	fi	171	fi
Lines 173-179 fi Link Here
173	if test x$WITH_LIBEVENT != xno; then	173	if test x$WITH_LIBEVENT != xno; then
174	PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT],	174	PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT],
175	[test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")])	175	[test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")])
176	if test x$BUILD_LIBEVENT == xauto; then	176	if test x$BUILD_LIBEVENT = xauto; then
177	BUILD_LIBEVENT=yes	177	BUILD_LIBEVENT=yes
178	fi	178	fi
179	fi	179	fi
Lines 181-199 fi Link Here
181	if test x$WITH_TEVENT != xno; then	181	if test x$WITH_TEVENT != xno; then
182	PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT],	182	PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT],
183	[test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")])	183	[test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")])
184	if test x$BUILD_TEVENT == xauto; then	184	if test x$BUILD_TEVENT = xauto; then
185	BUILD_TEVENT=yes	185	BUILD_TEVENT=yes
186	fi	186	fi
187	fi	187	fi
188		188
189	AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno])	189	AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno])
190	AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno])	190	AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno])
191	AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno])	191	AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno])
192	AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_TEVENT != xno])	192	AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_TEVENT != xno])
193	AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib])	193	AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib])
194	AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev])	194	AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev])
195	AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent])	195	AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent])
196	AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE == xtevent])	196	AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE = xtevent])
197		197
198	AC_MSG_NOTICE()	198	AC_MSG_NOTICE()
199	AC_MSG_NOTICE([BUILD CONFIGURATION])	199	AC_MSG_NOTICE([BUILD CONFIGURATION])