aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
Diffstat (limited to 'locale')
-rw-r--r--locale/Makefile.in5
-rw-r--r--locale/aclocal.m41
-rw-r--r--locale/config/Makefile.in5
-rwxr-xr-xlocale/configure100
-rw-r--r--locale/configure.ac7
-rw-r--r--locale/src/Makefile.in5
6 files changed, 97 insertions, 26 deletions
diff --git a/locale/Makefile.in b/locale/Makefile.in
index 7302019..401ba6c 100644
--- a/locale/Makefile.in
+++ b/locale/Makefile.in
@@ -51,7 +51,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/configure COPYING
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -86,6 +87,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -103,6 +105,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/locale/aclocal.m4 b/locale/aclocal.m4
index 0cdbeac..e7dee1b 100644
--- a/locale/aclocal.m4
+++ b/locale/aclocal.m4
@@ -889,4 +889,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([common/m4/ax_hack_cflags.m4])
m4_include([common/m4/ax_pd_external.m4])
diff --git a/locale/config/Makefile.in b/locale/config/Makefile.in
index f9f72f8..5ea1d44 100644
--- a/locale/config/Makefile.in
+++ b/locale/config/Makefile.in
@@ -42,7 +42,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/common/pdexternal.am depcomp install-sh missing
subdir = config
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -56,6 +57,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -73,6 +75,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/locale/configure b/locale/configure
index 407ca9c..62e18bb 100755
--- a/locale/configure
+++ b/locale/configure
@@ -640,6 +640,8 @@ am__untar
MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
+EXTRA_CPPFLAGS
+AM_CPPFLAGS
CC
CFLAGS
LDFLAGS
@@ -1755,11 +1757,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
-
##-- use automake, autoheader
am__api_version="1.9"
# Find a good install program. We prefer a C program (faster),
@@ -2228,6 +2225,66 @@ fi
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## Pd external checks
+
+ ##-- parse user's 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"
+
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+
+
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -2299,11 +2356,6 @@ fi
## prerequisites
- ##-- save user's CFLAGS,CPPFLAGS (do this before calling AX_PD_EXTERNAL!)
- #test -z "$UCPPFLAGS" && UCPPFLAGS="$CPPFLAGS"
- #test -z "$UCFLAGS" && UCFLAGS="$CFLAGS"
- #test -z "$ULDFLAGS" && ULDFLAGS="$LDFLAGS"
-
##-- Programs, prefix
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3812,11 +3864,6 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
- ##-- add defaults to user flags
- CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
- CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
- LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
-
## END platform-dependent variables
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -4799,6 +4846,21 @@ fi
#CFLAGS="$UCFLAGS"
#CPPFLAGS="$UCPPFLAGS"
+
+ ##-- add platform defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+
+ { 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 LDFLAGS=\"$LDFLAGS\"" >&5
+echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
+ ##-- pd external: late
ac_config_files="$ac_config_files config/Makefile src/Makefile Makefile"
cat >confcache <<\_ACEOF
@@ -5519,6 +5581,8 @@ am__untar!$am__untar$ac_delim
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
@@ -5553,8 +5617,6 @@ 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
-PDEXT_WFLAGS!$PDEXT_WFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -5596,11 +5658,13 @@ _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` = 2; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/locale/configure.ac b/locale/configure.ac
index a112a46..d7837dd 100644
--- a/locale/configure.ac
+++ b/locale/configure.ac
@@ -16,11 +16,6 @@ AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_AUX_DIR(config)
dnl AC_CONFIG_AUX_DIR(.)
-##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
-
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
AM_CONFIG_HEADER(src/config.h)
@@ -43,6 +38,7 @@ dnl AC_ISC_POSIX
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## Pd external checks
+AX_PD_EARLY
AX_PD_EXTERNAL
## /pd external common
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -87,4 +83,5 @@ fi
#CFLAGS="$UCFLAGS"
#CPPFLAGS="$UCPPFLAGS"
+AX_PD_LATE() ##-- pd external: late
AC_OUTPUT(config/Makefile src/Makefile Makefile)
diff --git a/locale/src/Makefile.in b/locale/src/Makefile.in
index 42eea8e..df51b75 100644
--- a/locale/src/Makefile.in
+++ b/locale/src/Makefile.in
@@ -52,7 +52,8 @@ pdexterns_PROGRAMS = locale$(EXEEXT) uselocale$(EXEEXT)
EXTRA_PROGRAMS = locale$(EXEEXT) uselocale$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -94,6 +95,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,6 +113,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@