From 61832067473edfe6677bbdd5b667e8fad8eb3090 Mon Sep 17 00:00:00 2001
From: xiangfu <xiangfu.z@gmail.com>
Date: Tue, 23 Jun 2009 09:42:21 +0000
Subject: [PATCH] [flash tool] correct the configure.ac with autoscan

---
 flash-tool/configure.ac     | 22 ++++++++++++----------
 flash-tool/debian/changelog |  2 +-
 flash-tool/debian/control   |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/flash-tool/configure.ac b/flash-tool/configure.ac
index 7ec91ae..469e8d2 100644
--- a/flash-tool/configure.ac
+++ b/flash-tool/configure.ac
@@ -1,39 +1,41 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.59)
-AC_INIT([inflash],[0.1])
+AC_PREREQ(2.63)
+AC_INIT([inflash], [0.1])
 AC_CONFIG_AUX_DIR(m4)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-#AC_CONFIG_SRCDIR([src/atmel.c])
 AM_CONFIG_HEADER([config.h])
 
 AM_MAINTAINER_MODE
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 
 # Checks for libraries.
-
-PKG_CHECK_MODULES(USB, libusb >= 0.1.4,,
-                 AC_MSG_ERROR([*** Required libusb >= 0.1.4 not installed ***]))
-AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb)
+AC_CHECK_LIB([c], [main])
+AC_CHECK_LIB([confuse], [main])
+AC_CHECK_LIB([gcc], [main])
+AC_CHECK_LIB([m], [main])
+AC_CHECK_LIB([usb], [main])
 
 LIBS="$LIBS $USB_LIBS"
 CFLAGS="$CFLAGS $USB_CFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h stdio.h usbpath.h])
+AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
+AC_C_INLINE
 AC_TYPE_SIZE_T
+AC_TYPE_UINT8_T
 
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([memset])
+AC_CHECK_FUNCS([memset strerror])
 
 AC_CONFIG_FILES(Makefile src/Makefile )
 AC_OUTPUT
diff --git a/flash-tool/debian/changelog b/flash-tool/debian/changelog
index 3ecdb68..2c70435 100644
--- a/flash-tool/debian/changelog
+++ b/flash-tool/debian/changelog
@@ -2,4 +2,4 @@ inflash (1.0.0-1) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
- -- xiangfu <xiangfu@unknown>  Mon, 22 Jun 2009 22:48:14 +0800
+ -- xiangfu <xiangfu.z@gmail.com>  Mon, 22 Jun 2009 22:48:14 +0800
diff --git a/flash-tool/debian/control b/flash-tool/debian/control
index f2352f7..0c974b1 100644
--- a/flash-tool/debian/control
+++ b/flash-tool/debian/control
@@ -2,7 +2,7 @@ Source: inflash
 Section: misc
 Priority: extra
 Maintainer: Xiangfu Liu <xiangfu.z@gmail.com>
-Build-Depends: debhelper (>= 7) libusb (>= 0.1.4) libconfuse0
+Build-Depends: debhelper (>= 7), libusb (>= 0.1.4), libconfuse
 Standards-Version: 3.8.0
 Homepage: http://code.google.com/p/pi-project/
 Package: inflash