Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zookeeper: Use PKG_CHECK_MODULES to detect the presence of cppunit #362

Closed
wants to merge 1 commit into from
Closed

zookeeper: Use PKG_CHECK_MODULES to detect the presence of cppunit #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/c/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if test "$with_cppunit" = "no" ; then
CPPUNIT_INCLUDE=
CPPUNIT_LIBS=
else
AM_PATH_CPPUNIT(1.10.2)
PKG_CHECK_MODULES([CPPUNIT], [cppunit >= 1.10.2])
fi

if test "$CALLER" = "ANT" ; then
Expand Down Expand Up @@ -130,11 +130,11 @@ main()
else
exit(0);
}
], AC_MSG_RESULT(yes)
ipv6=yes,
AC_MSG_RESULT(no)
ipv6=no,
AC_MSG_RESULT(no)
], AC_MSG_RESULT(yes)
ipv6=yes,
AC_MSG_RESULT(no)
ipv6=no,
AC_MSG_RESULT(no)
ipv6=no)

if test x"$ipv6" = xyes; then
Expand Down
6 changes: 3 additions & 3 deletions src/recipes/lock/src/c/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ DX_PDF_FEATURE(OFF)
DX_PS_FEATURE(OFF)
DX_INIT_DOXYGEN([zookeeper-locks],[c-doc.Doxyfile],[docs])


ZOOKEEPER_PATH=${BUILD_PATH}/../../../../../src/c
ZOOKEEPER_LD=-L${BUILD_PATH}/../../../../../src/c\ -lzookeeper_mt

Expand All @@ -71,8 +71,8 @@ AC_HEADER_TIME
AC_C_VOLATILE
AC_PROG_CC
AC_PROG_LIBTOOL
#check for cppunit
AM_PATH_CPPUNIT(1.10.2)
#check for cppunit
PKG_CHECK_MODULES([CPPUNIT], [cppunit >= 1.10.2])
# Checks for library functions.
AC_FUNC_UTIME_NULL
AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime])
Expand Down
6 changes: 3 additions & 3 deletions src/recipes/queue/src/c/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ DX_PDF_FEATURE(OFF)
DX_PS_FEATURE(OFF)
DX_INIT_DOXYGEN([zookeeper-queues],[c-doc.Doxyfile],[docs])


ZOOKEEPER_PATH=${BUILD_PATH}/../../../../../src/c
ZOOKEEPER_LD=-L${BUILD_PATH}/../../../../../src/c\ -lzookeeper_mt

Expand All @@ -71,8 +71,8 @@ AC_HEADER_TIME
AC_C_VOLATILE
AC_PROG_CC
AC_PROG_LIBTOOL
#check for cppunit
AM_PATH_CPPUNIT(1.10.2)
#check for cppunit
PKG_CHECK_MODULES([CPPUNIT], [cppunit >= 1.10.2])
# Checks for library functions.
AC_FUNC_UTIME_NULL
AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime])
Expand Down