Revert "Uprev libmtp to 1.1.12"

configure.ac

 # 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])
 AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_LIBTOOL_WIN32_DLL
 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)
 
 # Optionally set name of udev rules file, default
 # priority is 69, to appear before 70-acl.rules which handles
 # access control to the devices. We try to let all other userspace
 # libusb-based device handlers take precedence since libmtp may
 # attempt to autoprobe the devices.
 #
 # Later rules can then use the identifiers for its processing.
@@ skipping 15 matching lines @@
 # Optionally set mode for device nodes
 UDEV_MODE=
 AC_ARG_WITH(udev-mode,
     AC_HELP_STRING([--with-udev-mode=GROUP],
     [file mode for device nodes [default: none specified]]),
     [UDEV_MODE="-m\"${withval}\""], [])
 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])
 fi
 AM_CONDITIONAL(HAVE_DOXYGEN,$HAVE_DOXYGEN)
 
 # Check for Darwin
 AC_MSG_CHECKING([if the host operating system is Darwin])
 case "$host" in
   *-darwin*)
@@ skipping 104 matching lines @@
         langinfo.h locale.h arpa/inet.h byteswap.h sys/uio.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_OFF_T
 AC_TYPE_SIGNAL
 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)
 
 # Switches.
 # Enable LFS (Large File Support)
 AC_SYS_LARGEFILE
 # Stick in "-Werror" if you want to be more aggressive.
 # (No need to use AC_SUBST on this default substituted environment variable.)
 # Only add these additional CFLAGS if we are using GCC. Other C compilers may
@@ skipping 12 matching lines @@
 
 # Create a header file containing NetBSD-style byte swapping macros.
 # This m4 macros has caused severe pain, I am considering creating a
 # hard-coded byte swapper that will be eternally portable.
 AC_NEED_BYTEORDER_H(src/gphoto2-endian.h)
 
 AC_CONFIG_FILES([src/libmtp.h doc/Doxyfile Makefile doc/Makefile src/Makefile
         examples/Makefile util/Makefile libmtp.sh hotplug.sh libmtp.pc])
 AC_OUTPUT
 chmod +x hotplug.sh