Re: setup: use external crypto libraries

[Charles Wilson <cygwin at cwilson dot fastmail dot fm>]

On 3/18/2010 8:40 PM, Charles Wilson wrote:

> 2010-03-18  Charles Wilson  <...>
> 
> 	Use external crypto libraries
> 	* Makefile.am: Remove local libgcrypt and libgpg-error
> 	source directories from AM_CPPFLAGS.
> 	* configure.ac: Remove libgcrypt and libgpg-error subdirs
> 	from AC_CONFIG_SUBDIRS. Remove now-unnecessary cruft.
> 	* doconfigure: Specify gcc-3 and g++-3. Set PATH when $build
> 	is cygwin, so that correct (mingw) libgcrypt and libgpg-error
> 	config scripts can be used.
> 

It helps to attach the patch.

Index: Makefile.am
===================================================================
RCS file: /cvs/cygwin-apps/setup/Makefile.am,v
retrieving revision 2.79
diff -u -p -r2.79 Makefile.am
--- Makefile.am	14 Mar 2010 18:31:38 -0000	2.79
+++ Makefile.am	18 Mar 2010 23:57:04 -0000
@@ -36,7 +36,7 @@ AM_CFLAGS = $(AM_CXXFLAGS) -Wmissing-dec
 AM_YFLAGS = -d
 AM_LFLAGS = -8
 WINDRES = @WINDRES@
-AM_CPPFLAGS = -DLZMA_API_STATIC -I$(srcdir)/libgetopt++/include -I$(top_builddir)/libgpg-error/src -I$(top_builddir)/libgcrypt/src -I$(srcdir)/libgcrypt/src
+AM_CPPFLAGS = -DLZMA_API_STATIC -I$(srcdir)/libgetopt++/include
 
 noinst_PROGRAMS = setup @INILINT@
 
Index: configure.in
===================================================================
RCS file: /cvs/cygwin-apps/setup/configure.in,v
retrieving revision 2.24
diff -u -p -r2.24 configure.in
--- configure.in	25 Jun 2008 08:40:12 -0000	2.24
+++ configure.in	18 Mar 2010 23:57:04 -0000
@@ -70,14 +70,10 @@ AC_CHECK_HEADERS(alloca.h \
 		 string \
 		 string.h )
 
-dnl override configure of sub-libraries
-ac_cv_path_GPG_ERROR_CONFIG="${ac_abs_confdir}/gpg-error-config-fake --dir=$ac_pwd"
-
 prefix=`pwd`/inst; mkdir -p "$prefix"
 exec_prefix=$prefix
 ac_configure_args="$ac_configure_args --disable-shared"
-export GPG_ERROR_CONFIG="`pwd`/libgpg-error/src/gpg-error-config"
-AC_CONFIG_SUBDIRS(libgetopt++ libgpg-error libgcrypt)
+AC_CONFIG_SUBDIRS(libgetopt++)
 
 dnl add portability sources to inilint
 case "$host_os" in
Index: doconfigure
===================================================================
RCS file: /cvs/cygwin-apps/setup/doconfigure,v
retrieving revision 2.1
diff -u -p -r2.1 doconfigure
--- doconfigure	26 Dec 2006 16:03:19 -0000	2.1
+++ doconfigure	18 Mar 2010 23:57:04 -0000
@@ -9,11 +9,19 @@ if [ ! -f "$DIR/configure" ]; then
   ( cd "$DIR" && ./bootstrap.sh )
 fi
 
+# If $build == cygwin, set PATH so that correct (mingw)
+# version of gpg-error-config and libgcrypt-config are
+# used.  Otherwise: assume cross-compiler users are
+# sophisticated enough to do this manually.
+case `uname -s` in
+*CYGWIN* ) export PATH="/usr/lib/mingw:${PATH}" ;;
+esac
+
 # Configure
 cmd="\"$DIR/configure\""
 cmd=$cmd' -C --disable-shared --enable-maintainer-mode'
 cmd=$cmd' --host=i686-pc-mingw32 --build=i686-pc-cygwin'
-cmd=$cmd' CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"'
+cmd=$cmd' CC="gcc-3 -mno-cygwin" CXX="g++-3 -mno-cygwin"'
 
 for i in "$@"; do
   case $i in