Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: configure.ac

Issue 2364793002: Revert "Uprev libmtp to 1.1.12" (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « configure ('k') | depcomp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: configure.ac
diff --git a/configure.ac b/configure.ac
index 600105b3906c3d8f5586292ab99c1779dd9671f2..6fc47a2b85a0f93c4214aafd6ffec89a5d67cc6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([libmtp], [1.1.12], [libmtp-discuss@lists.sourceforge.net])
+AC_INIT([libmtp], [1.1.5], [libmtp-discuss@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([src/libmtp.c])
@@ -15,10 +15,10 @@ AC_PROG_LIBTOOL
AM_ICONV
# Optionally set install location of udev
-UDEV=/usr/lib/udev
+UDEV=/lib/udev
AC_ARG_WITH(udev,
AC_HELP_STRING([--with-udev=DIR],
- [directory where udev is installed [default=/usr/lib/udev]]),
+ [directory where udev is installed [default=/lib/udev]]),
[UDEV="${withval}"], [])
AC_SUBST(UDEV)
@@ -54,16 +54,14 @@ AC_SUBST(UDEV_MODE)
# Optionally enable and check for doxygen
AC_ARG_ENABLE([doxygen],
- AS_HELP_STRING([--enable-doxygen], [Build API documentation using Doxygen [default=auto]]),
+ AS_HELP_STRING([--enable-doxygen], [Build API documentation using Doxygen [default=no]]),
[ac_enable_doxygen=$enableval], [ac_enable_doxygen=auto])
-if test "x$ac_enable_doxygen" != "xno"; then
+if test "x$ac_enable_doxygen" == "xyes"; then
AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
if test "x$HAVE_DOXYGEN" = "xfalse" -a "x$ac_enable_doxygen" = "xyes"; then
AC_MSG_ERROR([*** API documentation explicitly requested but Doxygen not found])
fi
- if test "x$HAVE_DOXYGEN" = "xtrue"; then
- AC_MSG_NOTICE([API documentation will be generated using Doxygen])
- fi
+ AC_MSG_NOTICE([API documentation will be generated using Doxygen])
else
HAVE_DOXYGEN=false
AC_MSG_NOTICE([API documentation will not be generated])
@@ -188,6 +186,7 @@ AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
# Checks for library functions.
+AC_FUNC_MALLOC
AC_FUNC_MEMCMP
AC_FUNC_STAT
AC_CHECK_FUNCS(basename memset select strdup strerror strndup strrchr strtoul usleep mkstemp)
« no previous file with comments | « configure ('k') | depcomp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698