Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 62984 invoked from network); 1 Jun 2007 22:12:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Jun 2007 22:12:31 -0000 Received: (qmail 40973 invoked by uid 500); 1 Jun 2007 22:12:35 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 40939 invoked by uid 500); 1 Jun 2007 22:12:35 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 40928 invoked by uid 99); 1 Jun 2007 22:12:35 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jun 2007 15:12:35 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jun 2007 15:12:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BD0BF1A981A; Fri, 1 Jun 2007 15:12:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r543638 - in /apr/apr-iconv/trunk: Makefile.in buildconf configure.in lib/Makefile.in util/Makefile.in Date: Fri, 01 Jun 2007 22:12:09 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070601221209.BD0BF1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Fri Jun 1 15:12:08 2007 New Revision: 543638 URL: http://svn.apache.org/viewvc?view=rev&rev=543638 Log: Normalize libapriconv-1 for mingw as well as generic-nix: * name the shlib libapriconv-1 * on mingw builds, add win32 objects * write the headers to include/apr-1 for aprutil xlate to find * name the resulting utility bin/apriconv instead of iconv to avoid clobbering system-installed utilities. Requires the 1.2.0 designation (already committed) PR: 41914 Submitted by: Kouhei Sutou , wrowe Modified: apr/apr-iconv/trunk/Makefile.in apr/apr-iconv/trunk/buildconf apr/apr-iconv/trunk/configure.in apr/apr-iconv/trunk/lib/Makefile.in apr/apr-iconv/trunk/util/Makefile.in Modified: apr/apr-iconv/trunk/Makefile.in URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/Makefile.in?view=diff&rev=543638&r1=543637&r2=543638 ============================================================================== --- apr/apr-iconv/trunk/Makefile.in (original) +++ apr/apr-iconv/trunk/Makefile.in Fri Jun 1 15:12:08 2007 @@ -20,8 +20,13 @@ prefix=@prefix@ exec_prefix=@prefix@/bin lib_prefix=@prefix@/lib +include_prefix=@prefix@/include/@API_INCPATH@ libdir=@iconv_libdir@ +API_CPPFLAGS=@API_CPPFLAGS@ + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS=$(abs_srcdir)/build/mkdir.sh install: @@ -34,13 +39,18 @@ fi; \ (cd ccs; for i in *.la; do $(LIBTOOL) --mode=install cp $$i $(DESTDIR)$(libdir); done) (cd ces; for i in *.la; do $(LIBTOOL) --mode=install cp $$i $(DESTDIR)$(libdir); done) + if [ ! -d $(DESTDIR)$(include_prefix) ]; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(include_prefix); \ + fi; + $(INSTALL_DATA) include/api_version.h $(DESTDIR)$(include_prefix) + $(INSTALL_DATA) include/apr_iconv.h $(DESTDIR)$(include_prefix) if [ ! -d $(DESTDIR)$(exec_prefix) ]; then \ $(MKINSTALLDIRS) $(DESTDIR)$(exec_prefix); \ fi; \ - (cd util; $(LIBTOOL) --mode=install cp iconv $(DESTDIR)$(exec_prefix)) + (cd util; $(LIBTOOL) --mode=install cp apriconv $(DESTDIR)$(exec_prefix)) all: - (cd lib; $(MAKE)) + (cd lib; $(MAKE) CPPFLAGS="$(API_CPPFLAGS) $(CPPFLAGS)") (cd ccs; $(MAKE)) (cd ces; $(MAKE)) (cd util; $(MAKE)) Modified: apr/apr-iconv/trunk/buildconf URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/buildconf?view=diff&rev=543638&r1=543637&r2=543638 ============================================================================== --- apr/apr-iconv/trunk/buildconf (original) +++ apr/apr-iconv/trunk/buildconf Fri Jun 1 15:12:08 2007 @@ -36,11 +36,13 @@ # Remove some files, then copy them from apr source tree rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \ build/config.guess build/config.sub build/mkdir.sh \ - build/make_exports.awk build/make_var_export.awk + build/make_exports.awk build/make_var_export.awk \ + build/get-version.sh cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \ $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \ $apr_src_dir/build/config.sub $apr_src_dir/build/mkdir.sh \ $apr_src_dir/build/make_exports.awk $apr_src_dir/build/make_var_export.awk \ + $apr_src_dir/build/get-version.sh \ build # Remove aclocal.m4 as it'll break some builds... Modified: apr/apr-iconv/trunk/configure.in URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/configure.in?view=diff&rev=543638&r1=543637&r2=543638 ============================================================================== --- apr/apr-iconv/trunk/configure.in (original) +++ apr/apr-iconv/trunk/configure.in Fri Jun 1 15:12:08 2007 @@ -15,6 +15,7 @@ dnl This is required by autoconf! AC_PROG_AWK +AC_PROG_INSTALL dnl compute the top directory of the build # Absolute source/build directory @@ -66,6 +67,26 @@ ;; esac AC_SUBST(INCLUDE_RULES) + +dnl supportes MinGW +case "$host_alias" in +*mingw*) + API_CPPFLAGS="-DAPI_DECLARE_EXPORT" + ;; +esac +AC_SUBST(API_CPPFLAGS) + +dnl Absolute source/build directory +abs_srcdir=`(cd $srcdir && pwd)` + +dnl get our version information +get_version="$abs_srcdir/build/get-version.sh" +version_hdr="$abs_srcdir/include/api_version.h" +API_MAJOR_VERSION="`$get_version major $version_hdr API`" +API_LIBNAME="apriconv-${API_MAJOR_VERSION}" +AC_SUBST(API_LIBNAME) +API_INCPATH="apr-${API_MAJOR_VERSION}" +AC_SUBST(API_INCPATH) dnl dnl everthing is done. Modified: apr/apr-iconv/trunk/lib/Makefile.in URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/lib/Makefile.in?view=diff&rev=543638&r1=543637&r2=543638 ============================================================================== --- apr/apr-iconv/trunk/lib/Makefile.in (original) +++ apr/apr-iconv/trunk/lib/Makefile.in Fri Jun 1 15:12:08 2007 @@ -9,7 +9,7 @@ INCLUDES = @API_INCLUDES@ @APR_INCLUDES@ -TARGET_LIB = libapriconv.la +TARGET_LIB = lib@API_LIBNAME@.la SUBDIRS = . EXPORT_FILES = $(abs_srcdir)/include/*.h $(abs_srcdir)/lib/*.h @@ -36,6 +36,8 @@ OBJECTS_os2 = $(OBJECTS_all) OBJECTS_os390 = $(OBJECTS_all) + +OBJECTS_win32 = $(OBJECTS_all) # end replace $(TARGET_LIB): $(OBJECTS) @@ -48,7 +50,7 @@ $(AWK) -f $(abs_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@ $(TARGET_EXPORTS): exports.c export_vars.h - @echo "#! lib@APR_LIBNAME@.so" > $@ + @echo "#! lib@API_LIBNAME@.so" > $@ @echo "* This file was AUTOGENERATED at build time." >> $@ @echo "* Please do not edit by hand." >> $@ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@ Modified: apr/apr-iconv/trunk/util/Makefile.in URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/util/Makefile.in?view=diff&rev=543638&r1=543637&r2=543638 ============================================================================== --- apr/apr-iconv/trunk/util/Makefile.in (original) +++ apr/apr-iconv/trunk/util/Makefile.in Fri Jun 1 15:12:08 2007 @@ -1,15 +1,15 @@ VPATH = @srcdir@ INCLUDES = @API_INCLUDES@ @APR_INCLUDES@ -PROGRAMS = iconv +PROGRAMS = apriconv TARGETS = $(PROGRAMS) # bring in rules.mk for standard functionality @INCLUDE_RULES@ iconv_OBJECTS = iconv.lo iconv_stream.lo -iconv_LDADD = ../lib/libapriconv.la +iconv_LDADD = ../lib/lib@API_LIBNAME@.la APR_LIBS = @APR_LIBS@ -iconv: $(iconv_OBJECTS) $(iconv_LDADD) - $(LINK) $(iconv_OBJECTS) $(iconv_LDADD) $(LIBS) $(APR_LIBS) +apriconv: $(iconv_OBJECTS) $(iconv_LDADD) + $(LINK) -o $@ $(iconv_OBJECTS) $(iconv_LDADD) $(LIBS) $(APR_LIBS)