From 74b42e112d23280bff540b7b4eddd22ee988fa26 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 27 Jun 2008 00:44:41 +0000 Subject: [PATCH] --- ase/cmd/awk/makefile.in | 5 +- ase/cmd/lsp/makefile.in | 5 +- ase/cmd/makefile.in | 3 +- ase/configure | 158 +++++++++++++++++----- ase/configure.ac | 3 +- ase/include/ase/awk/awk.h | 6 +- ase/include/ase/awk/makefile.am | 3 +- ase/include/ase/cmn/makefile.am | 5 +- ase/include/ase/cmn/map.h | 6 +- ase/include/ase/cmn/mem.h | 6 +- ase/include/ase/cmn/rex.h | 6 +- ase/include/ase/cmn/str.h | 6 +- ase/include/ase/{cmn => }/conf_msw.h | 2 +- ase/include/ase/{cmn => }/conf_vms.h | 2 +- ase/include/ase/config.h | 170 ++++++++++++++++++++++++ ase/include/ase/{cmn => }/config.h.in | 2 +- ase/include/ase/lsp/lsp.h | 4 +- ase/include/ase/lsp/makefile.in | 3 +- ase/include/ase/{cmn => }/macros.h | 8 +- ase/include/ase/makefile.am | 12 +- ase/include/ase/{cmn/pack.h => pack1.h} | 2 +- ase/include/ase/{cmn => }/types.h | 10 +- ase/include/ase/{cmn => }/unpack.h | 2 +- ase/include/ase/utl/ctype.h | 6 +- ase/include/ase/utl/getopt.h | 6 +- ase/include/ase/utl/http.h | 6 +- ase/include/ase/utl/main.h | 6 +- ase/include/ase/utl/stdio.h | 6 +- ase/lib/awk/makefile.in | 3 +- ase/lib/cmn/makefile.in | 3 +- ase/lib/cmn/rex.c | 6 +- ase/lib/lsp/makefile.in | 3 +- ase/lib/lsp/name.h | 6 +- ase/lib/makefile.in | 3 +- ase/lib/utl/assert.c | 6 +- ase/lib/utl/makefile.in | 5 +- ase/makefile.in | 3 +- 37 files changed, 390 insertions(+), 107 deletions(-) rename ase/include/ase/{cmn => }/conf_msw.h (95%) rename ase/include/ase/{cmn => }/conf_vms.h (97%) create mode 100644 ase/include/ase/config.h rename ase/include/ase/{cmn => }/config.h.in (97%) rename ase/include/ase/{cmn => }/macros.h (97%) rename ase/include/ase/{cmn/pack.h => pack1.h} (84%) rename ase/include/ase/{cmn => }/types.h (98%) rename ase/include/ase/{cmn => }/unpack.h (82%) diff --git a/ase/cmd/awk/makefile.in b/ase/cmd/awk/makefile.in index cd4e74d6..d34aab83 100644 --- a/ase/cmd/awk/makefile.in +++ b/ase/cmd/awk/makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -56,7 +56,7 @@ aseawk_DEPENDENCIES = $(am__DEPENDENCIES_1) am_aseawk___OBJECTS = Awk.$(OBJEXT) aseawk___OBJECTS = $(am_aseawk___OBJECTS) aseawk___DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase/cmn +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -142,6 +142,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/cmd/lsp/makefile.in b/ase/cmd/lsp/makefile.in index 8f6c22f2..378e7b7e 100644 --- a/ase/cmd/lsp/makefile.in +++ b/ase/cmd/lsp/makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -53,7 +53,7 @@ am_aselsp_OBJECTS = lsp.$(OBJEXT) aselsp_OBJECTS = $(am_aselsp_OBJECTS) am__DEPENDENCIES_1 = aselsp_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase/cmn +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -131,6 +131,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/cmd/makefile.in b/ase/cmd/makefile.in index 6e4e3d95..57b399d4 100644 --- a/ase/cmd/makefile.in +++ b/ase/cmd/makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -117,6 +117,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/configure b/ase/configure index 48eb2f58..603efa46 100755 --- a/ase/configure +++ b/ase/configure @@ -869,6 +869,7 @@ F77 FFLAGS ac_ct_F77 LIBTOOL +RM CJ LIBTOOL_DEPS BUILDMODE @@ -1944,7 +1945,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers include/ase/cmn/config.h" +ac_config_headers="$ac_config_headers include/ase/config.h" ac_aux_dir= for ac_dir in autoconf "$srcdir"/autoconf; do @@ -4302,7 +4303,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4305 "configure"' > conftest.$ac_ext + echo '#line 4306 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7034,11 +7035,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7037: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7038: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7041: \$? = $ac_status" >&5 + echo "$as_me:7042: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7302,11 +7303,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7305: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7306: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7309: \$? = $ac_status" >&5 + echo "$as_me:7310: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7406,11 +7407,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7409: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7410: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7413: \$? = $ac_status" >&5 + echo "$as_me:7414: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8871,7 +8872,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8874 "configure"' > conftest.$ac_ext + echo '#line 8875 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9735,7 +9736,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12178: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12181: \$? = $ac_status" >&5 + echo "$as_me:12182: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12278,11 +12279,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12281: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12282: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12285: \$? = $ac_status" >&5 + echo "$as_me:12286: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12814,7 +12815,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12817 "configure"' > conftest.$ac_ext + echo '#line 12818 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13872,11 +13873,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13875: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13876: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13879: \$? = $ac_status" >&5 + echo "$as_me:13880: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13976,11 +13977,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13979: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13980: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13983: \$? = $ac_status" >&5 + echo "$as_me:13984: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15421,7 +15422,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15424 "configure"' > conftest.$ac_ext + echo '#line 15425 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -16198,11 +16199,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16201: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16202: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16205: \$? = $ac_status" >&5 + echo "$as_me:16206: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16466,11 +16467,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16469: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16470: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16473: \$? = $ac_status" >&5 + echo "$as_me:16474: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16570,11 +16571,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16573: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16574: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16577: \$? = $ac_status" >&5 + echo "$as_me:16578: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18035,7 +18036,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 18038 "configure"' > conftest.$ac_ext + echo '#line 18039 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -19549,6 +19550,102 @@ else GREP="$ac_cv_prog_GREP" fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}rm", so it can be a program name with args. +set dummy ${ac_tool_prefix}rm; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RM"; then + ac_cv_prog_RM="$RM" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RM="${ac_tool_prefix}rm" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +RM=$ac_cv_prog_RM +if test -n "$RM"; then + { echo "$as_me:$LINENO: result: $RM" >&5 +echo "${ECHO_T}$RM" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RM"; then + ac_ct_RM=$RM + # Extract the first word of "rm", so it can be a program name with args. +set dummy rm; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_RM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RM"; then + ac_cv_prog_ac_ct_RM="$ac_ct_RM" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RM="rm" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_RM=$ac_cv_prog_ac_ct_RM +if test -n "$ac_ct_RM"; then + { echo "$as_me:$LINENO: result: $ac_ct_RM" >&5 +echo "${ECHO_T}$ac_ct_RM" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_RM" = x; then + RM="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RM=$ac_ct_RM + fi +else + RM="$ac_cv_prog_RM" +fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args. set dummy ${ac_tool_prefix}gcj; ac_word=$2 @@ -27325,7 +27422,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "include/ase/cmn/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/ase/cmn/config.h" ;; + "include/ase/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/ase/config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "makefile") CONFIG_FILES="$CONFIG_FILES makefile" ;; "include/makefile") CONFIG_FILES="$CONFIG_FILES include/makefile" ;; @@ -27547,6 +27644,7 @@ F77!$F77$ac_delim FFLAGS!$FFLAGS$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim +RM!$RM$ac_delim CJ!$CJ$ac_delim LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim BUILDMODE!$BUILDMODE$ac_delim @@ -27563,7 +27661,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/ase/configure.ac b/ase/configure.ac index 918d4845..2fdaa07c 100644 --- a/ase/configure.ac +++ b/ase/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AC_INIT([ase],[0.5.0],[bacon@abiyo.net]) -AC_CONFIG_HEADER([include/ase/cmn/config.h]) +AC_CONFIG_HEADER([include/ase/config.h]) AC_CONFIG_AUX_DIR(autoconf) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) @@ -16,6 +16,7 @@ AC_CHECK_TOOL(RANLIB, ranlib) AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(GREP, grep) +AC_CHECK_TOOL(RM, rm) AC_CHECK_TOOL(CJ, gcj) AC_SUBST(LIBTOOL_DEPS) diff --git a/ase/include/ase/awk/awk.h b/ase/include/ase/awk/awk.h index f1995f85..b3704426 100644 --- a/ase/include/ase/awk/awk.h +++ b/ase/include/ase/awk/awk.h @@ -1,5 +1,5 @@ /* - * $Id: awk.h 196 2008-06-08 14:04:16Z baconevi $ + * $Id: awk.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -15,8 +15,8 @@ * a AWK interpreter engine. */ -#include -#include +#include +#include #include typedef struct ase_awk_t ase_awk_t; diff --git a/ase/include/ase/awk/makefile.am b/ase/include/ase/awk/makefile.am index 6ae68e9e..3b1f135e 100644 --- a/ase/include/ase/awk/makefile.am +++ b/ase/include/ase/awk/makefile.am @@ -1,5 +1,4 @@ -pkginclude_HEADERS = awk.h val.h +pkginclude_HEADERS = awk.h val.h Awk.hpp StdAwk.hpp pkgincludedir= $(includedir)/ase/awk - CLEANFILES = *dist diff --git a/ase/include/ase/cmn/makefile.am b/ase/include/ase/cmn/makefile.am index ae352eda..05fbc866 100644 --- a/ase/include/ase/cmn/makefile.am +++ b/ase/include/ase/cmn/makefile.am @@ -1,10 +1,7 @@ -pkginclude_HEADERS = config.h conf_msw.h conf_vms.h \ - macros.h map.h mem.h pack.h rex.h str.h types.h unpack.h +pkginclude_HEADERS = mem.h str.h map.h rex.h pkgincludedir= $(includedir)/ase/cmn CLEANFILES = *dist -install-data-hook: - "$(GREP)" -E "#define[ ]+ASE_" "$(pkgincludedir)/config.h" > "/tmp/config.h.$$$$" && mv "/tmp/config.h.$$$$" "$(pkgincludedir)/config.h" || "rm -f /tmp/config.h.$$$$" diff --git a/ase/include/ase/cmn/map.h b/ase/include/ase/cmn/map.h index 8951be1e..09199f05 100644 --- a/ase/include/ase/cmn/map.h +++ b/ase/include/ase/cmn/map.h @@ -1,5 +1,5 @@ /* - * $Id: map.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: map.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_CMN_MAP_H_ #define _ASE_CMN_MAP_H_ -#include -#include +#include +#include typedef struct ase_map_t ase_map_t; typedef struct ase_pair_t ase_pair_t; diff --git a/ase/include/ase/cmn/mem.h b/ase/include/ase/cmn/mem.h index 41d07b57..be4adf19 100644 --- a/ase/include/ase/cmn/mem.h +++ b/ase/include/ase/cmn/mem.h @@ -1,5 +1,5 @@ /* - * $Id: mem.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: mem.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_CMN_MEM_H_ #define _ASE_CMN_MEM_H_ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ase/include/ase/cmn/rex.h b/ase/include/ase/cmn/rex.h index 99511a8f..f3fc4030 100644 --- a/ase/include/ase/cmn/rex.h +++ b/ase/include/ase/cmn/rex.h @@ -1,5 +1,5 @@ /* - * $Id: rex.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: rex.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_CMN_REX_H_ #define _ASE_CMN_REX_H_ -#include -#include +#include +#include /* * Regular Esseression Syntax diff --git a/ase/include/ase/cmn/str.h b/ase/include/ase/cmn/str.h index f3954ca7..8a812792 100644 --- a/ase/include/ase/cmn/str.h +++ b/ase/include/ase/cmn/str.h @@ -1,5 +1,5 @@ /* - * $Id: str.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: str.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_CMN_STR_H_ #define _ASE_CMN_STR_H_ -#include -#include +#include +#include #define ASE_STR_LEN(x) ((x)->size) #define ASE_STR_SIZE(x) ((x)->size + 1) diff --git a/ase/include/ase/cmn/conf_msw.h b/ase/include/ase/conf_msw.h similarity index 95% rename from ase/include/ase/cmn/conf_msw.h rename to ase/include/ase/conf_msw.h index 4ca509aa..426a01f3 100644 --- a/ase/include/ase/cmn/conf_msw.h +++ b/ase/include/ase/conf_msw.h @@ -1,5 +1,5 @@ /* - * $Id: conf_msw.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: conf_msw.h 214 2008-06-19 09:54:58Z baconevi $ * * {License} */ diff --git a/ase/include/ase/cmn/conf_vms.h b/ase/include/ase/conf_vms.h similarity index 97% rename from ase/include/ase/cmn/conf_vms.h rename to ase/include/ase/conf_vms.h index ac5d91c7..95340ae2 100644 --- a/ase/include/ase/cmn/conf_vms.h +++ b/ase/include/ase/conf_vms.h @@ -1,5 +1,5 @@ /* - * $Id: conf_vms.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: conf_vms.h 214 2008-06-19 09:54:58Z baconevi $ * * {License} */ diff --git a/ase/include/ase/config.h b/ase/include/ase/config.h new file mode 100644 index 00000000..67b260cf --- /dev/null +++ b/ase/include/ase/config.h @@ -0,0 +1,170 @@ +/* include/ase/config.h. Generated from config.h.in by configure. */ +/* include/ase/config.h.in. Generated from configure.ac by autoheader. */ + +/* char is mchar */ +/* #undef ASE_CHAR_IS_MCHAR */ + +/* char is wchar */ +#define ASE_CHAR_IS_WCHAR + +/* Big Endian */ +/* #undef ASE_ENDIAN_BIG */ + +/* Little Endian */ +#define ASE_ENDIAN_LITTLE + +/* Unknown Endian */ +/* #undef ASE_ENDIAN_UNKNOWN */ + +/* author's email address */ +#define ASE_PKGAUTHOR "bacon@abiyo.net" + +/* package name */ +#define ASE_PKGNAME "ase" + +/* package version */ +#define ASE_PKGVERSION "0.5.0" + +/* sizeof(char) */ +#define ASE_SIZEOF_CHAR 1 + +/* sizeof(double) */ +#define ASE_SIZEOF_DOUBLE 8 + +/* sizeof(float) */ +#define ASE_SIZEOF_FLOAT 4 + +/* sizeof(int) */ +#define ASE_SIZEOF_INT 4 + +/* sizeof(long) */ +#define ASE_SIZEOF_LONG 8 + +/* sizeof(long double) */ +#define ASE_SIZEOF_LONG_DOUBLE 16 + +/* sizeof(long long) */ +#define ASE_SIZEOF_LONG_LONG 8 + +/* sizeof(short) */ +#define ASE_SIZEOF_SHORT 2 + +/* sizeof(void*) */ +#define ASE_SIZEOF_VOID_P 8 + +/* sizeof(wchar_t) */ +#define ASE_SIZEOF_WCHAR_T 4 + +/* sizeof(__int128) */ +#define ASE_SIZEOF___INT128 0 + +/* sizeof(__int16) */ +#define ASE_SIZEOF___INT16 0 + +/* sizeof(__int32) */ +#define ASE_SIZEOF___INT32 0 + +/* sizeof(__int64) */ +#define ASE_SIZEOF___INT64 0 + +/* sizeof(__int8) */ +#define ASE_SIZEOF___INT8 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Name of package */ +#define PACKAGE "ase" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "bacon@abiyo.net" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "ase" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "ase 0.5.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "ase" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.5.0" + +/* The size of `char', as computed by sizeof. */ +#define SIZEOF_CHAR 1 + +/* The size of `double', as computed by sizeof. */ +#define SIZEOF_DOUBLE 8 + +/* The size of `float', as computed by sizeof. */ +#define SIZEOF_FLOAT 4 + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 8 + +/* The size of `long double', as computed by sizeof. */ +#define SIZEOF_LONG_DOUBLE 16 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* The size of `void *', as computed by sizeof. */ +#define SIZEOF_VOID_P 8 + +/* The size of `wchar_t', as computed by sizeof. */ +#define SIZEOF_WCHAR_T 4 + +/* The size of `__int128', as computed by sizeof. */ +#define SIZEOF___INT128 0 + +/* The size of `__int16', as computed by sizeof. */ +#define SIZEOF___INT16 0 + +/* The size of `__int32', as computed by sizeof. */ +#define SIZEOF___INT32 0 + +/* The size of `__int64', as computed by sizeof. */ +#define SIZEOF___INT64 0 + +/* The size of `__int8', as computed by sizeof. */ +#define SIZEOF___INT8 0 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "0.5.0" diff --git a/ase/include/ase/cmn/config.h.in b/ase/include/ase/config.h.in similarity index 97% rename from ase/include/ase/cmn/config.h.in rename to ase/include/ase/config.h.in index 0abbc66b..29bd825d 100644 --- a/ase/include/ase/cmn/config.h.in +++ b/ase/include/ase/config.h.in @@ -1,4 +1,4 @@ -/* include/ase/cmn/config.h.in. Generated from configure.ac by autoheader. */ +/* include/ase/config.h.in. Generated from configure.ac by autoheader. */ /* char is mchar */ #undef ASE_CHAR_IS_MCHAR diff --git a/ase/include/ase/lsp/lsp.h b/ase/include/ase/lsp/lsp.h index 2fff06e9..67838c7e 100644 --- a/ase/include/ase/lsp/lsp.h +++ b/ase/include/ase/lsp/lsp.h @@ -7,8 +7,8 @@ #ifndef _ASE_LSP_LSP_H_ #define _ASE_LSP_LSP_H_ -#include -#include +#include +#include typedef struct ase_lsp_t ase_lsp_t; typedef struct ase_lsp_obj_t ase_lsp_obj_t; diff --git a/ase/include/ase/lsp/makefile.in b/ase/include/ase/lsp/makefile.in index 55b6c4d3..4e580f91 100644 --- a/ase/include/ase/lsp/makefile.in +++ b/ase/include/ase/lsp/makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -122,6 +122,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/include/ase/cmn/macros.h b/ase/include/ase/macros.h similarity index 97% rename from ase/include/ase/cmn/macros.h rename to ase/include/ase/macros.h index d8f95852..a3672a1d 100644 --- a/ase/include/ase/cmn/macros.h +++ b/ase/include/ase/macros.h @@ -1,11 +1,11 @@ /* - * $Id: macros.h 196 2008-06-08 14:04:16Z baconevi $ + * $Id: macros.h 214 2008-06-19 09:54:58Z baconevi $ * * {License} */ -#ifndef _ASE_CMN_MACROS_H_ -#define _ASE_CMN_MACROS_H_ +#ifndef _ASE_MACROS_H_ +#define _ASE_MACROS_H_ /** * @file macros.h @@ -15,7 +15,7 @@ * data type manipulation, etc. */ -#include +#include #ifdef __cplusplus /*#define ASE_NULL ((ase_uint_t)0)*/ diff --git a/ase/include/ase/makefile.am b/ase/include/ase/makefile.am index 89736987..9614b01f 100644 --- a/ase/include/ase/makefile.am +++ b/ase/include/ase/makefile.am @@ -1,5 +1,13 @@ -AUTOMAKE_OPTIONS = no-dependencies - # EXTRA_DIST = README SUBDIRS = cmn awk lsp utl + +pkginclude_HEADERS = config.h.in conf_msw.h conf_vms.h types.h macros.h pack1.h unpack.h + +pkgincludedir= $(includedir)/ase + +CLEANFILES = *dist + +install-data-hook: + @"$(GREP)" -E "#define[ ]+ASE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h" + @"$(RM)" -f "$(pkgincludedir)/config.h.in" diff --git a/ase/include/ase/cmn/pack.h b/ase/include/ase/pack1.h similarity index 84% rename from ase/include/ase/cmn/pack.h rename to ase/include/ase/pack1.h index 2c466f17..cae5f020 100644 --- a/ase/include/ase/cmn/pack.h +++ b/ase/include/ase/pack1.h @@ -1,5 +1,5 @@ /* - * $Id: pack.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: pack.h 214 2008-06-19 09:54:58Z baconevi $ * * {License} */ diff --git a/ase/include/ase/cmn/types.h b/ase/include/ase/types.h similarity index 98% rename from ase/include/ase/cmn/types.h rename to ase/include/ase/types.h index 910ec7af..562bf378 100644 --- a/ase/include/ase/cmn/types.h +++ b/ase/include/ase/types.h @@ -4,8 +4,8 @@ * {License} */ -#ifndef _ASE_CMN_TYPES_H_ -#define _ASE_CMN_TYPES_H_ +#ifndef _ASE_TYPES_H_ +#define _ASE_TYPES_H_ /** * @file types.h @@ -16,9 +16,9 @@ */ #if defined(_WIN32) - #include + #include #elif defined(vms) || defined(__vms) - #include + #include #elif defined(__unix__) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__SPU__) #if !defined(__unix__) #define __unix__ @@ -26,7 +26,7 @@ #if !defined(__unix) #define __unix #endif - #include + #include #else #error unsupported operating system #endif diff --git a/ase/include/ase/cmn/unpack.h b/ase/include/ase/unpack.h similarity index 82% rename from ase/include/ase/cmn/unpack.h rename to ase/include/ase/unpack.h index f49faa47..7c326937 100644 --- a/ase/include/ase/cmn/unpack.h +++ b/ase/include/ase/unpack.h @@ -1,5 +1,5 @@ /* - * $Id: unpack.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: unpack.h 214 2008-06-19 09:54:58Z baconevi $ * * {License} */ diff --git a/ase/include/ase/utl/ctype.h b/ase/include/ase/utl/ctype.h index c843a911..58eba8d8 100644 --- a/ase/include/ase/utl/ctype.h +++ b/ase/include/ase/utl/ctype.h @@ -1,12 +1,12 @@ /* - * $Id: ctype.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: ctype.h 223 2008-06-26 06:44:41Z baconevi $ */ #ifndef _ASE_UTL_CTYPE_H_ #define _ASE_UTL_CTYPE_H_ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ase/include/ase/utl/getopt.h b/ase/include/ase/utl/getopt.h index c68dfc84..ce05402d 100644 --- a/ase/include/ase/utl/getopt.h +++ b/ase/include/ase/utl/getopt.h @@ -1,5 +1,5 @@ /* - * $Id: getopt.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: getopt.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_UTL_GETOPT_H_ #define _ASE_UTL_GETOPT_H_ -#include -#include +#include +#include typedef struct ase_opt_t ase_opt_t; diff --git a/ase/include/ase/utl/http.h b/ase/include/ase/utl/http.h index 948baab4..96050402 100644 --- a/ase/include/ase/utl/http.h +++ b/ase/include/ase/utl/http.h @@ -1,5 +1,5 @@ /* - * $Id: http.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: http.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_UTL_HTTP_H_ #define _ASE_UTL_HTTP_H_ -#include -#include +#include +#include /* returns the type of http method */ typedef struct ase_http_req_t ase_http_req_t; diff --git a/ase/include/ase/utl/main.h b/ase/include/ase/utl/main.h index d465a9bf..d3b0694c 100644 --- a/ase/include/ase/utl/main.h +++ b/ase/include/ase/utl/main.h @@ -1,5 +1,5 @@ /* - * $Id: main.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: main.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_UTL_MAIN_H_ #define _ASE_UTL_MAIN_H_ -#include -#include +#include +#include #if defined(_WIN32) #include diff --git a/ase/include/ase/utl/stdio.h b/ase/include/ase/utl/stdio.h index 30356862..ebce6ec6 100644 --- a/ase/include/ase/utl/stdio.h +++ b/ase/include/ase/utl/stdio.h @@ -1,5 +1,5 @@ /* - * $Id: stdio.h 194 2008-06-06 13:00:39Z baconevi $ + * $Id: stdio.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_UTL_STDIO_H_ #define _ASE_UTL_STDIO_H_ -#include -#include +#include +#include #include #include diff --git a/ase/lib/awk/makefile.in b/ase/lib/awk/makefile.in index b4ce1452..e536b266 100644 --- a/ase/lib/awk/makefile.in +++ b/ase/lib/awk/makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -147,6 +147,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/lib/cmn/makefile.in b/ase/lib/cmn/makefile.in index c435b3e0..332495a1 100644 --- a/ase/lib/cmn/makefile.in +++ b/ase/lib/cmn/makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -136,6 +136,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/lib/cmn/rex.c b/ase/lib/cmn/rex.c index 89596035..ffc130b7 100644 --- a/ase/lib/cmn/rex.c +++ b/ase/lib/cmn/rex.c @@ -1,5 +1,5 @@ /* - * $Id: rex.c 197 2008-06-09 06:24:10Z baconevi $ + * $Id: rex.c 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -131,7 +131,7 @@ struct match_t const ase_byte_t* branch_end; }; -#include +#include ASE_BEGIN_PACKED_STRUCT (code_t) /*ase_byte_t cmd;*/ @@ -159,7 +159,7 @@ ASE_BEGIN_PACKED_STRUCT (cshdr_t) ase_size_t csl; /* length */ ASE_END_PACKED_STRUCT () -#include +#include typedef const ase_byte_t* (*atom_matcher_t) ( matcher_t* matcher, const ase_byte_t* base, match_t* mat); diff --git a/ase/lib/lsp/makefile.in b/ase/lib/lsp/makefile.in index 9cdac29f..54ad7513 100644 --- a/ase/lib/lsp/makefile.in +++ b/ase/lib/lsp/makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -137,6 +137,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/lib/lsp/name.h b/ase/lib/lsp/name.h index e4b2c4a1..b7013a8f 100644 --- a/ase/lib/lsp/name.h +++ b/ase/lib/lsp/name.h @@ -1,5 +1,5 @@ /* - * $Id: name.h 117 2008-03-03 11:20:05Z baconevi $ + * $Id: name.h 223 2008-06-26 06:44:41Z baconevi $ * * {License} */ @@ -7,8 +7,8 @@ #ifndef _ASE_LSP_NAME_H_ #define _ASE_LSP_NAME_H_ -#include -#include +#include +#include struct ase_lsp_name_t { diff --git a/ase/lib/makefile.in b/ase/lib/makefile.in index a55f02ad..30d8c517 100644 --- a/ase/lib/makefile.in +++ b/ase/lib/makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -117,6 +117,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/lib/utl/assert.c b/ase/lib/utl/assert.c index 2382cee7..6aec373c 100644 --- a/ase/lib/utl/assert.c +++ b/ase/lib/utl/assert.c @@ -1,9 +1,9 @@ /* - * $Id: assert.c 201 2008-06-09 06:57:20Z baconevi $ + * $Id: assert.c 223 2008-06-26 06:44:41Z baconevi $ */ -#include -#include +#include +#include #ifndef NDEBUG diff --git a/ase/lib/utl/makefile.in b/ase/lib/utl/makefile.in index 2ef72050..1d1479c5 100644 --- a/ase/lib/utl/makefile.in +++ b/ase/lib/utl/makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -58,7 +58,7 @@ libaseutl_la_LIBADD = am_libaseutl_la_OBJECTS = assert.lo ctype.lo getopt.lo http.lo main.lo \ stdio.lo libaseutl_la_OBJECTS = $(am_libaseutl_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase/cmn +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -136,6 +136,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/ase/makefile.in b/ase/makefile.in index c3bd4fd3..50874735 100644 --- a/ase/makefile.in +++ b/ase/makefile.in @@ -55,7 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h +CONFIG_HEADER = $(top_builddir)/include/ase/config.h CONFIG_CLEAN_FILES = lib/tgp/makefile SOURCES = DIST_SOURCES = @@ -140,6 +140,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@