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

Side by Side Diff: configure.ac

Issue 11358153: Update libmtp from pre 1.1.4 git to 1.1.5 release. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libmtp/
Patch Set: disable mptz Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« config.h ('K') | « configure ('k') | examples/albumart.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Process this file with autoconf to produce a configure script. 1 # Process this file with autoconf to produce a configure script.
2 AC_PREREQ(2.52) 2 AC_PREREQ(2.52)
3 AC_INIT([libmtp], [1.1.3], [libmtp-discuss@lists.sourceforge.net]) 3 AC_INIT([libmtp], [1.1.5], [libmtp-discuss@lists.sourceforge.net])
4 AC_CONFIG_MACRO_DIR([m4]) 4 AC_CONFIG_MACRO_DIR([m4])
5 AM_INIT_AUTOMAKE([foreign]) 5 AM_INIT_AUTOMAKE([foreign])
6 AC_CONFIG_SRCDIR([src/libmtp.c]) 6 AC_CONFIG_SRCDIR([src/libmtp.c])
7 AM_CONFIG_HEADER(config.h) 7 AM_CONFIG_HEADER(config.h)
8 8
9 # Checks for programs. 9 # Checks for programs.
10 AC_PROG_CC 10 AC_PROG_CC
11 AC_PROG_INSTALL 11 AC_PROG_INSTALL
12 AC_PROG_LN_S 12 AC_PROG_LN_S
13 AC_LIBTOOL_WIN32_DLL 13 AC_LIBTOOL_WIN32_DLL
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 AC_DEFINE(USE_MTPZ, [], [Enable MTPZ functionality]) 157 AC_DEFINE(USE_MTPZ, [], [Enable MTPZ functionality])
158 AC_MSG_NOTICE([MTPZ functionality enabled]); 158 AC_MSG_NOTICE([MTPZ functionality enabled]);
159 else 159 else
160 AC_MSG_NOTICE([MTPZ functionality disable]); 160 AC_MSG_NOTICE([MTPZ functionality disable]);
161 fi 161 fi
162 162
163 163
164 AC_SUBST(LIBUSB_CFLAGS) 164 AC_SUBST(LIBUSB_CFLAGS)
165 AC_SUBST(LIBUSB_LIBS) 165 AC_SUBST(LIBUSB_LIBS)
166 AC_SUBST(LIBUSB_REQUIRES) 166 AC_SUBST(LIBUSB_REQUIRES)
167 AM_CONDITIONAL(MTPZ_COMPILE, test x"$use_mtpz" = "xyes")
167 AM_CONDITIONAL(LIBUSB1_COMPILE, test x"$found_libusb1_pkg" = "xyes") 168 AM_CONDITIONAL(LIBUSB1_COMPILE, test x"$found_libusb1_pkg" = "xyes")
168 AM_CONDITIONAL(LIBUSB0_COMPILE, test x"$found_libusb0_pkg" = "xyes") 169 AM_CONDITIONAL(LIBUSB0_COMPILE, test x"$found_libusb0_pkg" = "xyes")
169 AM_CONDITIONAL(LIBOPENUSB_COMPILE, test x"$ac_cv_lib_openusb_openusb_init" = "xy es") 170 AM_CONDITIONAL(LIBOPENUSB_COMPILE, test x"$ac_cv_lib_openusb_openusb_init" = "xy es")
170 AC_MSG_NOTICE([*** using libusb $LIBUSB_VER ***]) 171 AC_MSG_NOTICE([*** using libusb $LIBUSB_VER ***])
171 172
172 # Checks for header files. 173 # Checks for header files.
173 AC_HEADER_STDC 174 AC_HEADER_STDC
174 AC_HEADER_TIME 175 AC_HEADER_TIME
175 # zlib.h the day we need to decompress firmware 176 # zlib.h the day we need to decompress firmware
176 AC_CHECK_HEADERS([ctype.h errno.h fcntl.h getopt.h libgen.h \ 177 AC_CHECK_HEADERS([ctype.h errno.h fcntl.h getopt.h libgen.h \
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 212
212 # Create a header file containing NetBSD-style byte swapping macros. 213 # Create a header file containing NetBSD-style byte swapping macros.
213 # This m4 macros has caused severe pain, I am considering creating a 214 # This m4 macros has caused severe pain, I am considering creating a
214 # hard-coded byte swapper that will be eternally portable. 215 # hard-coded byte swapper that will be eternally portable.
215 AC_NEED_BYTEORDER_H(src/gphoto2-endian.h) 216 AC_NEED_BYTEORDER_H(src/gphoto2-endian.h)
216 217
217 AC_CONFIG_FILES([src/libmtp.h doc/Doxyfile Makefile doc/Makefile src/Makefile 218 AC_CONFIG_FILES([src/libmtp.h doc/Doxyfile Makefile doc/Makefile src/Makefile
218 examples/Makefile util/Makefile libmtp.sh hotplug.sh libmtp.pc]) 219 examples/Makefile util/Makefile libmtp.sh hotplug.sh libmtp.pc])
219 AC_OUTPUT 220 AC_OUTPUT
220 chmod +x hotplug.sh 221 chmod +x hotplug.sh
OLDNEW
« config.h ('K') | « configure ('k') | examples/albumart.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698