From: Guido Draheim <guidod@gmx.de>
Date: Sat, 27 Jun 2009 18:28:17 +0000 (+0000)
Subject: configure.ac - disable search for python2.2
X-Git-Tag: v0.13.55~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3fd80da7ba827acd05aeb1c1d9c507242917cdf;p=zziplib

configure.ac - disable search for python2.2
---

diff --git a/ChangeLog b/ChangeLog
index 5db8fdf..5d9bfe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-27  guidod  <guidod@gmx.de>
+
+	* configure.ac: disable search for python2.2 (gentoo bug 275247+174189)
+
 2009-06-22  guidod  <guidod@gmx.de>
     * zziplib.spec: 0.13.55 and integrate patches for build.opensuse.org
 	* zzip/zip.c (__zzip_parse_root_directory): rework parse_directory
diff --git a/configure b/configure
index b343761..0a1c2ce 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.12 .
+# From configure.ac Revision: 1.13 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.63.
 #
@@ -12825,7 +12825,7 @@ fi
 done
 test -n "$PERL" || PERL="echo no perl found for"
 
-for ac_prog in python2.2 python2.3 python
+for ac_prog in python
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -16176,7 +16176,11 @@ case "$host_os" in
     RESOLVES=' '
   ;;
   *)
-    ZZIPLIB_LDFLAGS="--export-dynamic"
+
+    if ".$can_build_shared" = .no
+    then ZZIPLIB_LDFLAGS=""
+    else ZZIPLIB_LDFLAGS="--export-dynamic"
+    fi
     RESOLVES=' # '
   ;;
 esac
diff --git a/configure.ac b/configure.ac
index cea80ff..43dc21b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT([zziplib.spec])
 AC_PREREQ(2.49)
 AC_COPYRIGHT([Guido Draheim <guido@gmx.de> for ZZipLib.SF.net])
-AC_REVISION($Revision: 1.13 $)
+AC_REVISION($Revision: 1.14 $)
 AC_CONFIG_AUX_DIR([uses])
 AC_CONFIG_MACRO_DIR([m4])
 # =======================================================================
@@ -88,7 +88,7 @@ echo extrac.t..
 AX_PAX_TAR_CREATE
 AX_PAX_TAR_EXTRACT
 AC_PATH_PROGS(PERL, perl5 perl, echo no perl found for)
-AC_PATH_PROGS(PYTHON, python2.2 python2.3 python, echo no python found for)
+AC_PATH_PROGS(PYTHON, python, echo no python found for)
 AC_PATH_PROGS(MKZIP, zip pkzip, :)
 AC_PATH_PROGS(XMLTO, xmlto, :)
 
diff --git a/docs/Makefile.in b/docs/Makefile.in
index a346bfb..e4bab4d 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -539,10 +539,12 @@ manpages.tar : zziplib.xml zzipmmapped.xml zzipfseeko.xml
 	;       $(XMLTO) -o man3 man zzipmmapped.xml  \
 	; echo '$(XMLTO) -o man3 man zzipfseeko.xml' \
 	;       $(XMLTO) -o man3 man zzipfseeko.xml  \
+	; if test -d man3/man3; then mv man3 man3_ \
+	;   mv man3_/man3 man3; rm -r man3_; fi \
 	; echo 'chmod 664 man3/*.3' \
 	;       chmod 664 man3/*.3  \
-	; echo '$(PAX_TAR_CREATE) "$@" man3/*.3' \
-	;       $(PAX_TAR_CREATE) "$@" man3/*.3  \
+	; echo '$(PAX_TAR_CREATE) "$@" man3/' \
+	;       $(PAX_TAR_CREATE) "$@" man3/  \
 	; echo '$(DELETE); rm man3/*.3 ; rmdir man3' \
 	;       $(DELETE); rm man3/*.3 ; rmdir man3  \
 	; fi ; true
@@ -576,7 +578,7 @@ htmpages.tar : zziplib.xml zzipmmapped.xml zzipfseeko.xml zziplib-manpages.dbk
 install-man3 : manpages.tar
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man3
 	P=`pwd` ; test -s manpages.tar || exit 1 \
-	; cd $(DESTDIR)$(mandir)/man3 && $(PAX_TAR_EXTRACT) $$P/manpages.tar \
+	; cd $(DESTDIR)$(mandir) && $(PAX_TAR_EXTRACT) $$P/manpages.tar \
         ; true
 
 unpack : manpages.tar htmpages.tar