aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
Diffstat (limited to 'locale')
-rw-r--r--locale/Makefile.in2
-rw-r--r--locale/config/Makefile.in2
-rwxr-xr-xlocale/configure100
-rw-r--r--locale/src/Makefile.in2
4 files changed, 91 insertions, 15 deletions
diff --git a/locale/Makefile.in b/locale/Makefile.in
index 401ba6c..9d8339d 100644
--- a/locale/Makefile.in
+++ b/locale/Makefile.in
@@ -87,7 +87,6 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -185,6 +184,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
DEXT = @PDEXT@
SUFFIXES = .@PDEXT@ .pod .txt .html
+AM_CPPFLAGS = $(EXTRA_CPPFLAGS)
EXTRA_DIST = \
$(PODS) \
$(PODS:.pod=.txt) \
diff --git a/locale/config/Makefile.in b/locale/config/Makefile.in
index 5ea1d44..584131c 100644
--- a/locale/config/Makefile.in
+++ b/locale/config/Makefile.in
@@ -57,7 +57,6 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -155,6 +154,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
DEXT = @PDEXT@
SUFFIXES = .@PDEXT@ .pod .txt .html
+AM_CPPFLAGS = $(EXTRA_CPPFLAGS)
EXTRA_DIST = \
$(PODS) \
$(PODS:.pod=.txt) \
diff --git a/locale/configure b/locale/configure
index 62e18bb..8964105 100755
--- a/locale/configure
+++ b/locale/configure
@@ -641,7 +641,6 @@ MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
EXTRA_CPPFLAGS
-AM_CPPFLAGS
CC
CFLAGS
LDFLAGS
@@ -2227,7 +2226,15 @@ fi
## Pd external checks
##-- parse user's CFLAGS,CPPFLAGS
+ { echo "$as_me:$LINENO: pre-processing user CFLAGS..." >&5
+echo "$as_me: pre-processing user CFLAGS..." >&6;}
+ { echo "$as_me:$LINENO: got CFLAGS=\"$CFLAGS\"" >&5
+echo "$as_me: got CFLAGS=\"$CFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: got CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: got CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ cflags=
+ cppflags=
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## BEGIN AX_DISTRIBUTE_CFLAGS
@@ -2276,8 +2283,21 @@ fi
CFLAGS="$cflags"
CPPFLAGS="$cppflags"
- AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+ ##-- trim whitespace
+ CFLAGS=`echo $CFLAGS`
+ CPPFLAGS=`echo $CPPFLAGS`
+ EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS`
+ #LDFLAGS=`echo $LDFLAGS`
+ { echo "$as_me:$LINENO: setting distributed CFLAGS..." >&5
+echo "$as_me: setting distributed CFLAGS..." >&6;}
+ { echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
+echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS\"" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS\"" >&6;}
+ #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
##-- save (hacked) user's CFLAGS,CPPFLAGS
@@ -3833,8 +3853,8 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >
if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1
then
PDEXT_DFLAGS="\
- -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \
- -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \
+ -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \
+ -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
@@ -4848,16 +4868,73 @@ fi
##-- add platform defaults to user flags
- CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
- CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
- LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$LDFLAGS $PDEXT_LFLAGS"
+
+ ##-- ... and re-hack
+ cflags=
+ cppflags=
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $CFLAGS
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test xCPPFLAGS != x && CPPFLAGS="$CPPFLAGS $axdf_cppflags"
+ test xcflags != x && cflags="$cflags $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $CPPFLAGS
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test xcppflags != x && cppflags="$cppflags $axsf_safe"
+ test xEXTRA_CPPFLAGS != x && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ ##-- trim whitespace
+ CFLAGS=`echo $CFLAGS`
+ CPPFLAGS=`echo $CPPFLAGS`
+ EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS`
+ LDFLAGS=`echo $LDFLAGS`
{ echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
{ echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
- { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS" >&5
-echo "$as_me: set CFLAGS=\"$CFLAGS" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS\"" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS\"" >&6;}
{ echo "$as_me:$LINENO: set LDFLAGS=\"$LDFLAGS\"" >&5
echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
##-- pd external: late
@@ -5582,7 +5659,6 @@ MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
MAINT!$MAINT$ac_delim
EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
-AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -5617,6 +5693,7 @@ PDEXT_AFLAGS!$PDEXT_AFLAGS$ac_delim
PDEXT_DFLAGS!$PDEXT_DFLAGS$ac_delim
PDEXT_IFLAGS!$PDEXT_IFLAGS$ac_delim
PDEXT_LFLAGS!$PDEXT_LFLAGS$ac_delim
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -5658,13 +5735,12 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
PDEXT_WFLAGS!$PDEXT_WFLAGS$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/locale/src/Makefile.in b/locale/src/Makefile.in
index df51b75..b7d61e2 100644
--- a/locale/src/Makefile.in
+++ b/locale/src/Makefile.in
@@ -95,7 +95,6 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -193,6 +192,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
DEXT = @PDEXT@
SUFFIXES = .@PDEXT@ .pod .txt .html
+AM_CPPFLAGS = $(EXTRA_CPPFLAGS)
EXTRA_DIST = \
$(PODS) \
$(PODS:.pod=.txt) \
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 05:39:10 +0000