new version of checkpatch.pl from 2.6.35-rc1 kernel

[gregoa/bti.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 944981e3bacfdedff89a00c22235e4daff0ccc6a..f19ff0e9105f36bb2f6bcec2090d6cbbe969e2bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,11 @@
-AC_INIT([bti], [021], [greg@kroah.com])
+AC_INIT([bti], [027], [greg@kroah.com])

 AC_PREREQ(2.60)
 
 AC_PREREQ(2.60)
 

-AM_INIT_AUTOMAKE(bti, 021)
+AM_INIT_AUTOMAKE(bti, 027)

 dnl AM_CONFIG_HEADER([check-news foreign 1.9 dist-bzip2])
 
 dnl AM_CONFIG_HEADER([check-news foreign 1.9 dist-bzip2])
 

+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+

 AC_PROG_CC
 AC_PROG_INSTALL
 
 AC_PROG_CC
 AC_PROG_INSTALL
 


@@ -13,29 +15,32 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 dnl FIXME: Replace `main' with a function in `-lnsl':
 AC_CHECK_LIB([nsl], [main])
 
 dnl FIXME: Replace `main' with a function in `-lnsl':
 AC_CHECK_LIB([nsl], [main])

-dnl FIXME: Replace `main' with a function in `-lreadline':
-AC_CHECK_LIB([readline], [main])

 
 

-AC_CHECK_LIB([pcre], [main])
+PKG_PROG_PKG_CONFIG()
+
+PKG_CHECK_MODULES(LIBOAUTH, oauth)
+AC_SUBST(LIBOAUTH_CFLAGS)
+AC_SUBST(LIBOAUTH_LIBS)
+
+PKG_CHECK_MODULES(LIBPCRE, libpcre)
+AC_SUBST(LIBPCRE_CFLAGS)
+AC_SUBST(LIBPCRE_LIBS)
+

 
 # CURL
 LIBCURL_CHECK_CONFIG([yes], [], [have_libcurl="yes"], [have_libcurl="no"])
 if test "${have_libcurl}" != yes; then
        AC_MSG_ERROR([libcurl library not found, please install it])
 
 # CURL
 LIBCURL_CHECK_CONFIG([yes], [], [have_libcurl="yes"], [have_libcurl="no"])
 if test "${have_libcurl}" != yes; then
        AC_MSG_ERROR([libcurl library not found, please install it])

-else
-       CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-       LIBS="${LIBS} ${LIBCURL}"

 fi
 
 # libxml2
 AM_PATH_XML2([], [have_libxml="yes"], [have_libxml="no"])
 if test "${have_libxml}" != yes; then
        AC_MSG_ERROR([libxml not found, please install it])
 fi
 
 # libxml2
 AM_PATH_XML2([], [have_libxml="yes"], [have_libxml="no"])
 if test "${have_libxml}" != yes; then
        AC_MSG_ERROR([libxml not found, please install it])

-else
-       CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
-       LIBS="$LIBS $XML_LIBS"

 fi
 
 fi
 

+# explicitly link DSOs
+LIBS="$LIBS -ldl"

 
 
 dnl Checks for header files.
 
 
 dnl Checks for header files.