deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

submodule check in configure

Browse Source
This commit is contained in:
NIIBE Yutaka
2016-02-08 10:00:30 +09:00
parent 3f8c4d1f17
commit db23a1d051
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,4 +1,9 @@
2015-11-30 perillamint <perillamint@gentoo.moe> 2016-02-05 Niibe Yutaka <gniibe@fsij.org>
* src/configure: Add submodule check suggested by Elliott
Mitchell.
2015-11-30 perillamint <perillamint@gentoo.moe>
* src/openpgp.c (card_thread): Fix offset of bConfirmPIN. * src/openpgp.c (card_thread): Fix offset of bConfirmPIN.

1
THANKS
View File

@@ -14,6 +14,7 @@ Andre Zepezauer andre.zepezauer@student.uni-halle.de
Bertrand Jacquin bertrand@jacquin.bzh Bertrand Jacquin bertrand@jacquin.bzh
Clint Adams clint@softwarefreedom.org Clint Adams clint@softwarefreedom.org
Daniel Kahn Gillmor dkg@fifthhorseman.net Daniel Kahn Gillmor dkg@fifthhorseman.net
Elliott Mitchell
Hironobu SUZUKI hironobu@h2np.net Hironobu SUZUKI hironobu@h2np.net
Jan Suhr jan@suhr.info Jan Suhr jan@suhr.info
Jonathan McDowell noodles@earth.li Jonathan McDowell noodles@earth.li

21
src/configure vendored
View File

@@ -6,7 +6,7 @@ nl=$'\n'
# #
# This file is *NOT* generated by GNU Autoconf, but written by NIIBE Yutaka # This file is *NOT* generated by GNU Autoconf, but written by NIIBE Yutaka
# #
# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015 # Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016
# Free Software Initiative of Japan # Free Software Initiative of Japan
# #
# This file is a part of Gnuk, a GnuPG USB Token implementation. # This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -23,6 +23,15 @@ nl=$'\n'
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Submodule check
#
if ! test -f ../chopstx/rules.mk; then
echo "Submodule 'chopstx' not found" >&2
echo "You might need: git submodule update --init" >&2
exit 1
fi
# Default settings # Default settings
help=no help=no
vidpid=none vidpid=none
@@ -127,7 +136,7 @@ EOF
fi fi
if test "$vidpid" = "none"; then if test "$vidpid" = "none"; then
echo "Please specify Vendor ID and Product ID by --vidpid option." echo "Please specify Vendor ID and Product ID by --vidpid option." >&2
exit 1 exit 1
fi fi
@@ -181,7 +190,7 @@ fi
# --with-dfu option # --with-dfu option
if test "$with_dfu" = "yes"; then if test "$with_dfu" = "yes"; then
if test "$target" = "FST_01" -o "$target" = "FST_01_00"; then if test "$target" = "FST_01" -o "$target" = "FST_01_00"; then
echo "FST-01 doesn't have DFU loader, you should not use --with-dfu." echo "FST-01 doesn't have DFU loader, you should not use --with-dfu." >&2
exit 1 exit 1
fi fi
echo "Configured for DFU" echo "Configured for DFU"
@@ -247,7 +256,7 @@ if test "$sys1_compat" = "yes"; then
CONFIG="$target:dfu=$with_dfu:debug=$debug:pinpad=$pinpad:certdo=$certdo" CONFIG="$target:dfu=$with_dfu:debug=$debug:pinpad=$pinpad:certdo=$certdo"
else else
if test "$with_dfu" = "yes"; then if test "$with_dfu" = "yes"; then
echo "Common binary can't support DFU loader, don't use --with-dfu." echo "Common binary can't support DFU loader, don't use --with-dfu." >&2
exit 1 exit 1
fi fi
# Override settings for common binary. Safer side. # Override settings for common binary. Safer side.
@@ -317,8 +326,8 @@ if !(IFS=" "
fi fi
done; exit 1) < ../GNUK_USB_DEVICE_ID done; exit 1) < ../GNUK_USB_DEVICE_ID
then then
echo "Please specify valid Vendor ID and Product ID." echo "Please specify valid Vendor ID and Product ID." >&2
echo "Check ../GNUK_USB_DEVICE_ID." echo "Check ../GNUK_USB_DEVICE_ID." >&2
exit 1 exit 1
fi fi