JBoss Native SVN: r1585 - trunk/httpd/httpd-2.2.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 07:54:56 -0400 (Fri, 02 May 2008)
New Revision: 1585
Modified:
trunk/httpd/httpd-2.2/NMAKEmakefile
Log:
Distribute installconf scripts
Modified: trunk/httpd/httpd-2.2/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEmakefile 2008-05-02 11:47:54 UTC (rev 1584)
+++ trunk/httpd/httpd-2.2/NMAKEmakefile 2008-05-02 11:54:56 UTC (rev 1585)
@@ -114,3 +114,5 @@
-@copy /Y "$(SRCDIR)\docs\conf\mime.types" "$(BUILDCFG)\default" >NUL
-@copy /Y "$(SRCDIR)\docs\conf\magic" "$(BUILDCFG)\default" >NUL
-@copy /Y "$(SRCDIR)\docs\cgi-examples\printenv" "$(BUILDCGI)\printenv.pl" >NUL
+ -@copy /Y "$(SRCDIR)\installer\installconf.awk" "$(BUILDOUT)" >NUL
+ -@copy /Y "$(SRCDIR)\installer\installconf.bat" "$(BUILDOUT)" >NUL
16 years, 7 months
JBoss Native SVN: r1584 - trunk/httpd/httpd-2.2.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 07:47:54 -0400 (Fri, 02 May 2008)
New Revision: 1584
Modified:
trunk/httpd/httpd-2.2/NMAKEmakefile
Log:
Fix typo
Modified: trunk/httpd/httpd-2.2/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEmakefile 2008-05-02 11:45:21 UTC (rev 1583)
+++ trunk/httpd/httpd-2.2/NMAKEmakefile 2008-05-02 11:47:54 UTC (rev 1584)
@@ -109,7 +109,7 @@
@xcopy "$(SRCDIR)\docs\icons" "$(BUILDICO)" /Y /Q /E
@xcopy "$(SRCDIR)\docs\docroot" "$(BUILDDOC)" /Y /Q /E
@xcopy "$(SRCDIR)\docs\conf\extra" "$(BUILDCFG)\default\extra" /Y /Q
- -@copy /Y "$(SRCDIR)\docs\conf\httpd.conf.in" "$(BUILDCFG)\default" >NUL \
+ -@copy /Y "$(SRCDIR)\docs\conf\httpd.conf.in" "$(BUILDCFG)\default" >NUL
-@copy /Y "$(SRCDIR)\docs\conf\charset.conv" "$(BUILDCFG)\default" >NUL
-@copy /Y "$(SRCDIR)\docs\conf\mime.types" "$(BUILDCFG)\default" >NUL
-@copy /Y "$(SRCDIR)\docs\conf\magic" "$(BUILDCFG)\default" >NUL
16 years, 7 months
JBoss Native SVN: r1583 - trunk/httpd/httpd-2.2.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 07:45:21 -0400 (Fri, 02 May 2008)
New Revision: 1583
Modified:
trunk/httpd/httpd-2.2/NMAKEhttpd.inc
Log:
Pre create conf/default
Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-05-02 08:17:15 UTC (rev 1582)
+++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-05-02 11:45:21 UTC (rev 1583)
@@ -69,7 +69,8 @@
$(PREFIX)\cgi-bin\~ \
$(PREFIX)\logs\~ \
$(PREFIX)\error\include\~ \
- $(PREFIX)\conf\extra\~
+ $(PREFIX)\conf\extra\~ \
+ $(PREFIX)\conf\default\extra\~
$(DISTSUBDIRS):
@if not exist "$(@D)\$(NULL)" mkdir $(@D)
16 years, 7 months
JBoss Native SVN: r1582 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 04:17:15 -0400 (Fri, 02 May 2008)
New Revision: 1582
Added:
trunk/build/unix/util/rpm2file.sh
Log:
Add .rpm extract util
Added: trunk/build/unix/util/rpm2file.sh
===================================================================
--- trunk/build/unix/util/rpm2file.sh (rev 0)
+++ trunk/build/unix/util/rpm2file.sh 2008-05-02 08:17:15 UTC (rev 1582)
@@ -0,0 +1,65 @@
+!/bin/sh
+# Copyright(c) 2007 Red Hat Middleware, LLC,
+# and individual contributors as indicated by the @authors tag.
+# See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library in the file COPYING.LIB;
+# if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# @author Mladen Turk
+#
+
+if $xb_verbose; then
+ echo ""
+ echo "Running `basename $0` $LastChangedDate: 2008-03-25 11:15:54 +0100 (Tue, 25 Mar 2008) $"
+ echo ""
+ echo "Started : `date`"
+ echo "Params : $@"
+ echo ""
+fi
+
+xb_rpm2file()
+{
+ if [ ! -d $xbrpm_srcd ]; then
+ mkdir $xbrpm_srcd
+ fi
+ (cd $xbrpm_srcd
+ $xb_progloc/rpm2cpio.pl $xbrpm_srcf | cpio -iduv
+ for xbrpm_arch in `ls -1 *.tar.gz`
+ do
+ gunzip -c ${xbrpm_arch} | tar -xf -
+ done
+ xbrpm_specf=`ls *.spec | head -n 1`
+ echo "Spec file is " $xbrpm_specf
+ #
+ # TODO: Apply patches from .spec file
+ #
+ )
+}
+
+# Common runtime variables
+xb_prognam=`realpath $0`
+xb_progloc=`dirname $xb_prognam`
+
+# Extract .src.rpm file
+# $1 rpm file
+
+xbrpm_srcf=`realpath $1`
+xbrpm_srca=`basename $1 .src.rpm`
+xbrpm_srcd=`dirname $1`/$xbrpm_srca
+
+# Call the internal functions
+xb_rpm2file
Property changes on: trunk/build/unix/util/rpm2file.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ LF
16 years, 7 months
JBoss Native SVN: r1581 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 04:06:27 -0400 (Fri, 02 May 2008)
New Revision: 1581
Modified:
trunk/build/unix/util/applypatch.sh
Log:
Fix typo
Modified: trunk/build/unix/util/applypatch.sh
===================================================================
--- trunk/build/unix/util/applypatch.sh 2008-05-02 07:01:08 UTC (rev 1580)
+++ trunk/build/unix/util/applypatch.sh 2008-05-02 08:06:27 UTC (rev 1581)
@@ -64,7 +64,7 @@
xbap_build_top=$1
xbap_package_dir=$2
-xbsp_is_rhel=$3
+xbap_is_rhel=$3
# Call the internal functions.
xb_applypatch
16 years, 7 months
JBoss Native SVN: r1580 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 03:01:08 -0400 (Fri, 02 May 2008)
New Revision: 1580
Added:
trunk/build/unix/util/rpm2cpio.pl
Removed:
trunk/build/unix/util/rpm2cpio
Log:
Use correct file name
Deleted: trunk/build/unix/util/rpm2cpio
===================================================================
--- trunk/build/unix/util/rpm2cpio 2008-05-02 06:37:23 UTC (rev 1579)
+++ trunk/build/unix/util/rpm2cpio 2008-05-02 07:01:08 UTC (rev 1580)
@@ -1,86 +0,0 @@
-#!/usr/bin/perl
-
-# Why does the world need another rpm2cpio? Because the existing one
-# won't build unless you have half a ton of things that aren't really
-# required for it, since it uses the same library used to extract RPMs.
-# In particular, it won't build on the HPsUX box I'm on.
-
-#
-# Expanded quick-reference help by Rick Moen (not the original author
-# of this script).
-#
-
-# add a path if desired
-$gzip = "gzip";
-
-sub printhelp {
- print "\n";
- print "rpm2cpio, perl version by orabidoo <odar\(a)pobox.com>\n";
- print "\n";
- print "use: rpm2cpio [file.rpm]\n";
- print "dumps the contents to stdout as a GNU cpio archive\n";
- print "\n";
- print "In case it's non-obvious, you'll need to redirect output\n";
- print "from this script, e.g., './rpm2cpio package.rpm > package.cpio'.\n";
- print "Then, unpack in, say, /tmp with a cpio incantation like this one:\n";
- print "'cpio -ivd < package.cpio'\n";
- print "\n";
- print "You can optionally combine both steps:\n";
- print "'rpm2cpio package.rpm | cpio -iduv'\n";
- print "\n";
- print "In either event, you will also need the 'cpio' utility available\n";
- print "on your system. If you can't find it elsewhere, source code for\n";
- print "GNU cpio is always available at ftp://ftp.gnu.org/gnu/cpio/.)\n";
- print "You'll also, of course, need Perl, and will want this Perl script\n";
- print "set as executable, i.e., by doing 'chmod 775 rpm2cpio'\n";
- print "\n";
- print "Be aware that this script works ONLY on version 3 or 4-format RPM\n";
- print "archives. You can check an archive's RPM-format version using\n";
- print "the Unix 'file' utility. Also, be aware that the 'cpio'\n";
- print "incantations above will unpack files at the current directory\n";
- print "level.\n";
- print "\n";
- exit 0;
-}
-
-if ($#ARGV == -1) {
- printhelp if -t STDIN;
- $f = "STDIN";
-} elsif ($#ARGV == 0) {
- open(F, "< $ARGV[0]") or die "Can't read file $ARGV[0]\n";
- $f = 'F';
-} else {
- printhelp;
-}
-
-printhelp if -t STDOUT;
-
-# gobble the file up
-undef $/;
-$|=1;
-$rpm = <$f>;
-close ($f);
-
-($magic, $major, $minor, $crap) = unpack("NCC C90", $rpm);
-
-die "Not an RPM\n" if $magic != 0xedabeedb;
-die "Not a version 3 or 4 RPM\n" if $major != 3 and $major != 4;
-
-$rpm = substr($rpm, 96);
-
-while ($rpm ne '') {
- $rpm =~ s/^\c@*//s;
- ($magic, $crap, $sections, $bytes) = unpack("N4", $rpm);
- $smagic = unpack("n", $rpm);
- last if $smagic eq 0x1f8b;
- die "Error: header not recognized\n" if $magic != 0x8eade801;
- $rpm = substr($rpm, 16*(1+$sections) + $bytes);
-}
-
-die "bogus RPM\n" if $rpm eq '';
-
-open(ZCAT, "|gzip -cd") || die "can't pipe to gzip\n";
-print STDERR "CPIO archive found!\n";
-
-print ZCAT $rpm;
-close ZCAT;
Copied: trunk/build/unix/util/rpm2cpio.pl (from rev 1578, trunk/build/unix/util/rpm2cpio)
===================================================================
--- trunk/build/unix/util/rpm2cpio.pl (rev 0)
+++ trunk/build/unix/util/rpm2cpio.pl 2008-05-02 07:01:08 UTC (rev 1580)
@@ -0,0 +1,86 @@
+#!/usr/bin/perl
+
+# Why does the world need another rpm2cpio? Because the existing one
+# won't build unless you have half a ton of things that aren't really
+# required for it, since it uses the same library used to extract RPMs.
+# In particular, it won't build on the HPsUX box I'm on.
+
+#
+# Expanded quick-reference help by Rick Moen (not the original author
+# of this script).
+#
+
+# add a path if desired
+$gzip = "gzip";
+
+sub printhelp {
+ print "\n";
+ print "rpm2cpio, perl version by orabidoo <odar\(a)pobox.com>\n";
+ print "\n";
+ print "use: rpm2cpio [file.rpm]\n";
+ print "dumps the contents to stdout as a GNU cpio archive\n";
+ print "\n";
+ print "In case it's non-obvious, you'll need to redirect output\n";
+ print "from this script, e.g., './rpm2cpio package.rpm > package.cpio'.\n";
+ print "Then, unpack in, say, /tmp with a cpio incantation like this one:\n";
+ print "'cpio -ivd < package.cpio'\n";
+ print "\n";
+ print "You can optionally combine both steps:\n";
+ print "'rpm2cpio package.rpm | cpio -iduv'\n";
+ print "\n";
+ print "In either event, you will also need the 'cpio' utility available\n";
+ print "on your system. If you can't find it elsewhere, source code for\n";
+ print "GNU cpio is always available at ftp://ftp.gnu.org/gnu/cpio/.)\n";
+ print "You'll also, of course, need Perl, and will want this Perl script\n";
+ print "set as executable, i.e., by doing 'chmod 775 rpm2cpio'\n";
+ print "\n";
+ print "Be aware that this script works ONLY on version 3 or 4-format RPM\n";
+ print "archives. You can check an archive's RPM-format version using\n";
+ print "the Unix 'file' utility. Also, be aware that the 'cpio'\n";
+ print "incantations above will unpack files at the current directory\n";
+ print "level.\n";
+ print "\n";
+ exit 0;
+}
+
+if ($#ARGV == -1) {
+ printhelp if -t STDIN;
+ $f = "STDIN";
+} elsif ($#ARGV == 0) {
+ open(F, "< $ARGV[0]") or die "Can't read file $ARGV[0]\n";
+ $f = 'F';
+} else {
+ printhelp;
+}
+
+printhelp if -t STDOUT;
+
+# gobble the file up
+undef $/;
+$|=1;
+$rpm = <$f>;
+close ($f);
+
+($magic, $major, $minor, $crap) = unpack("NCC C90", $rpm);
+
+die "Not an RPM\n" if $magic != 0xedabeedb;
+die "Not a version 3 or 4 RPM\n" if $major != 3 and $major != 4;
+
+$rpm = substr($rpm, 96);
+
+while ($rpm ne '') {
+ $rpm =~ s/^\c@*//s;
+ ($magic, $crap, $sections, $bytes) = unpack("N4", $rpm);
+ $smagic = unpack("n", $rpm);
+ last if $smagic eq 0x1f8b;
+ die "Error: header not recognized\n" if $magic != 0x8eade801;
+ $rpm = substr($rpm, 16*(1+$sections) + $bytes);
+}
+
+die "bogus RPM\n" if $rpm eq '';
+
+open(ZCAT, "|gzip -cd") || die "can't pipe to gzip\n";
+print STDERR "CPIO archive found!\n";
+
+print ZCAT $rpm;
+close ZCAT;
16 years, 7 months
JBoss Native SVN: r1579 - trunk/srclib/iconv.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 02:37:23 -0400 (Fri, 02 May 2008)
New Revision: 1579
Modified:
trunk/srclib/iconv/apu.iconv.patch
Log:
Add eol:LF property as for each patch file
Property changes on: trunk/srclib/iconv/apu.iconv.patch
___________________________________________________________________
Name: svn:eol-style
+ LF
16 years, 7 months
JBoss Native SVN: r1578 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 02:36:03 -0400 (Fri, 02 May 2008)
New Revision: 1578
Added:
trunk/build/unix/util/rpm2cpio
Log:
Add rpm2cpio
Added: trunk/build/unix/util/rpm2cpio
===================================================================
--- trunk/build/unix/util/rpm2cpio (rev 0)
+++ trunk/build/unix/util/rpm2cpio 2008-05-02 06:36:03 UTC (rev 1578)
@@ -0,0 +1,86 @@
+#!/usr/bin/perl
+
+# Why does the world need another rpm2cpio? Because the existing one
+# won't build unless you have half a ton of things that aren't really
+# required for it, since it uses the same library used to extract RPMs.
+# In particular, it won't build on the HPsUX box I'm on.
+
+#
+# Expanded quick-reference help by Rick Moen (not the original author
+# of this script).
+#
+
+# add a path if desired
+$gzip = "gzip";
+
+sub printhelp {
+ print "\n";
+ print "rpm2cpio, perl version by orabidoo <odar\(a)pobox.com>\n";
+ print "\n";
+ print "use: rpm2cpio [file.rpm]\n";
+ print "dumps the contents to stdout as a GNU cpio archive\n";
+ print "\n";
+ print "In case it's non-obvious, you'll need to redirect output\n";
+ print "from this script, e.g., './rpm2cpio package.rpm > package.cpio'.\n";
+ print "Then, unpack in, say, /tmp with a cpio incantation like this one:\n";
+ print "'cpio -ivd < package.cpio'\n";
+ print "\n";
+ print "You can optionally combine both steps:\n";
+ print "'rpm2cpio package.rpm | cpio -iduv'\n";
+ print "\n";
+ print "In either event, you will also need the 'cpio' utility available\n";
+ print "on your system. If you can't find it elsewhere, source code for\n";
+ print "GNU cpio is always available at ftp://ftp.gnu.org/gnu/cpio/.)\n";
+ print "You'll also, of course, need Perl, and will want this Perl script\n";
+ print "set as executable, i.e., by doing 'chmod 775 rpm2cpio'\n";
+ print "\n";
+ print "Be aware that this script works ONLY on version 3 or 4-format RPM\n";
+ print "archives. You can check an archive's RPM-format version using\n";
+ print "the Unix 'file' utility. Also, be aware that the 'cpio'\n";
+ print "incantations above will unpack files at the current directory\n";
+ print "level.\n";
+ print "\n";
+ exit 0;
+}
+
+if ($#ARGV == -1) {
+ printhelp if -t STDIN;
+ $f = "STDIN";
+} elsif ($#ARGV == 0) {
+ open(F, "< $ARGV[0]") or die "Can't read file $ARGV[0]\n";
+ $f = 'F';
+} else {
+ printhelp;
+}
+
+printhelp if -t STDOUT;
+
+# gobble the file up
+undef $/;
+$|=1;
+$rpm = <$f>;
+close ($f);
+
+($magic, $major, $minor, $crap) = unpack("NCC C90", $rpm);
+
+die "Not an RPM\n" if $magic != 0xedabeedb;
+die "Not a version 3 or 4 RPM\n" if $major != 3 and $major != 4;
+
+$rpm = substr($rpm, 96);
+
+while ($rpm ne '') {
+ $rpm =~ s/^\c@*//s;
+ ($magic, $crap, $sections, $bytes) = unpack("N4", $rpm);
+ $smagic = unpack("n", $rpm);
+ last if $smagic eq 0x1f8b;
+ die "Error: header not recognized\n" if $magic != 0x8eade801;
+ $rpm = substr($rpm, 16*(1+$sections) + $bytes);
+}
+
+die "bogus RPM\n" if $rpm eq '';
+
+open(ZCAT, "|gzip -cd") || die "can't pipe to gzip\n";
+print STDERR "CPIO archive found!\n";
+
+print ZCAT $rpm;
+close ZCAT;
Property changes on: trunk/build/unix/util/rpm2cpio
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ LF
16 years, 7 months
JBoss Native SVN: r1577 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 02:35:04 -0400 (Fri, 02 May 2008)
New Revision: 1577
Modified:
trunk/build/unix/buildbin.jboss-httpd.windows.sh
Log:
Force build
Modified: trunk/build/unix/buildbin.jboss-httpd.windows.sh
===================================================================
--- trunk/build/unix/buildbin.jboss-httpd.windows.sh 2008-05-02 05:30:21 UTC (rev 1576)
+++ trunk/build/unix/buildbin.jboss-httpd.windows.sh 2008-05-02 06:35:04 UTC (rev 1577)
@@ -60,6 +60,6 @@
(cd $native_sources
echo "Running nmake at `pwd`"
- nmake -f NMAKEmakefile ${add_conf} install
+ nmake -a -f NMAKEmakefile ${add_conf} install
)
\ No newline at end of file
16 years, 7 months
JBoss Native SVN: r1576 - in trunk/httpd/httpd-2.2: srclib/apr-util and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 01:30:21 -0400 (Fri, 02 May 2008)
New Revision: 1576
Modified:
trunk/httpd/httpd-2.2/NMAKEhttpd.inc
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
Log:
Add GNU iconv to the makefiles
Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-05-02 05:11:34 UTC (rev 1575)
+++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-05-02 05:30:21 UTC (rev 1576)
@@ -45,11 +45,19 @@
ZLIB = zlib-1.lib
LIBZLIB = libzlib-1.lib
LIBHTTPD = libhttpd.lib
+LIBICONV = libiconv-1.lib
!IF "$(TARGET)" != "LIB"
LFLAGS = $(LFLAGS) /version:2.2
!ENDIF
+!IFDEF WITH_GNU_ICONV
+API = $(LIBICONV)
+LIBAPI = $(LIBICONV)
+!ENDIF
+
+
+
DISTSUBDIRS = \
$(PREFIX)\include\arch\win32\~ \
$(PREFIX)\lib\~ \
Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-05-02 05:11:34 UTC (rev 1575)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-05-02 05:30:21 UTC (rev 1576)
@@ -28,18 +28,26 @@
!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == ""
TARGET=DLL
-CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT -DAPI_DECLARE_EXPORT $(CFLAGS)
+CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT $(CFLAGS)
PROJECT = libaprutil-1
APR_LIB = libapr-1.lib
API_LIB = libapriconv-1.lib
+API_CFLAGS = -DAPI_DECLARE_EXPORT
!ELSE
-CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC -DAPI_DECLARE_STATIC $(CFLAGS)
+TARGET=LIB
+CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC $(CFLAGS)
PROJECT = aprutil-1
APR_LIB = apr-1.lib
API_LIB = apriconv-1.lib
-TARGET=LIB
+API_CFLAGS = -DAPI_DECLARE_STATIC
!ENDIF
+!IFDEF WITH_GNU_ICONV
+API_LIB = libiconv-1.lib
+!ELSE
+CFLAGS = $(CFLAGS) $(API_CFLAGS)
+!ENDIF
+
CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\"
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
@@ -53,6 +61,9 @@
WITH_APR=..\apr
!ENDIF
+!IFDEF WITH_GNU_ICONV
+WITH_API=..\libiconv
+!ENDIF
!IFNDEF WITH_API
WITH_API=..\apr-iconv
!ENDIF
16 years, 7 months