diff --git a/ase/cmd/awk/makefile.in b/ase/cmd/awk/makefile.in index f794ef60..cd4e74d6 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/ase/cmd/lsp/makefile.in b/ase/cmd/lsp/makefile.in index 5a588c23..8f6c22f2 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/ase/cmd/makefile.in b/ase/cmd/makefile.in index 2e6c0838..6e4e3d95 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/ase/configure b/ase/configure index 1a014437..48eb2f58 100755 --- a/ase/configure +++ b/ase/configure @@ -1944,7 +1944,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/conf_unx.h" +ac_config_headers="$ac_config_headers include/ase/cmn/config.h" ac_aux_dir= for ac_dir in autoconf "$srcdir"/autoconf; do @@ -19453,7 +19453,102 @@ else fi -# native java compiler +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}grep", so it can be a program name with args. +set dummy ${ac_tool_prefix}grep; 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_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$GREP"; then + ac_cv_prog_GREP="$GREP" # 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_GREP="${ac_tool_prefix}grep" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GREP=$ac_cv_prog_GREP +if test -n "$GREP"; then + { echo "$as_me:$LINENO: result: $GREP" >&5 +echo "${ECHO_T}$GREP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_GREP"; then + ac_ct_GREP=$GREP + # Extract the first word of "grep", so it can be a program name with args. +set dummy grep; 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_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_GREP"; then + ac_cv_prog_ac_ct_GREP="$ac_ct_GREP" # 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_GREP="grep" + 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_GREP=$ac_cv_prog_ac_ct_GREP +if test -n "$ac_ct_GREP"; then + { echo "$as_me:$LINENO: result: $ac_ct_GREP" >&5 +echo "${ECHO_T}$ac_ct_GREP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_GREP" = x; then + GREP="" + 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 + GREP=$ac_ct_GREP + fi +else + GREP="$ac_cv_prog_GREP" +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 @@ -20139,128 +20234,8 @@ esac # Checks for data types -{ echo "$as_me:$LINENO: checking for long long" >&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6; } -if test "${ac_cv_type_long_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef long long ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_long_long=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_long_long=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_long_long" >&6; } -if test $ac_cv_type_long_long = yes; then - -cat >>confdefs.h <<\_ACEOF -#define ASE_HAVE_LONG_LONG -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for long double" >&5 -echo $ECHO_N "checking for long double... $ECHO_C" >&6; } -if test "${ac_cv_type_long_double+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef long double ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_long_double=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_long_double=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5 -echo "${ECHO_T}$ac_cv_type_long_double" >&6; } -if test $ac_cv_type_long_double = yes; then - -cat >>confdefs.h <<\_ACEOF -#define ASE_HAVE_LONG_DOUBLE -_ACEOF - -fi - +#AC_CHECK_TYPE(long long, [AC_DEFINE([ASE_HAVE_LONG_LONG],[],[long long])]) +#AC_CHECK_TYPE(long double, [AC_DEFINE([ASE_HAVE_LONG_DOUBLE],[],[long double])]) { echo "$as_me:$LINENO: checking for char" >&5 echo $ECHO_N "checking for char... $ECHO_C" >&6; } @@ -27350,7 +27325,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "include/ase/cmn/conf_unx.h") CONFIG_HEADERS="$CONFIG_HEADERS include/ase/cmn/conf_unx.h" ;; + "include/ase/cmn/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/ase/cmn/config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "makefile") CONFIG_FILES="$CONFIG_FILES makefile" ;; "include/makefile") CONFIG_FILES="$CONFIG_FILES include/makefile" ;; diff --git a/ase/configure.ac b/ase/configure.ac index 177b9439..918d4845 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/conf_unx.h]) +AC_CONFIG_HEADER([include/ase/cmn/config.h]) AC_CONFIG_AUX_DIR(autoconf) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) @@ -15,7 +15,7 @@ AC_PROG_LIBTOOL AC_CHECK_TOOL(RANLIB, ranlib) AC_CHECK_TOOL(AR, ar) -# native java compiler +AC_CHECK_TOOL(GREP, grep) AC_CHECK_TOOL(CJ, gcj) AC_SUBST(LIBTOOL_DEPS) @@ -86,8 +86,8 @@ AC_C_BIGENDIAN( [AC_DEFINE([ASE_ENDIAN_UNKNOWN],[],[Unknown Endian])]) # Checks for data types -AC_CHECK_TYPE(long long, [AC_DEFINE([ASE_HAVE_LONG_LONG],[],[long long])]) -AC_CHECK_TYPE(long double, [AC_DEFINE([ASE_HAVE_LONG_DOUBLE],[],[long double])]) +#AC_CHECK_TYPE(long long, [AC_DEFINE([ASE_HAVE_LONG_LONG],[],[long long])]) +#AC_CHECK_TYPE(long double, [AC_DEFINE([ASE_HAVE_LONG_DOUBLE],[],[long double])]) AC_CHECK_SIZEOF(char) AC_CHECK_SIZEOF(short) diff --git a/ase/include/ase/cmn/conf_unx.h.in b/ase/include/ase/cmn/config.h.in similarity index 95% rename from ase/include/ase/cmn/conf_unx.h.in rename to ase/include/ase/cmn/config.h.in index d6c6b363..0abbc66b 100644 --- a/ase/include/ase/cmn/conf_unx.h.in +++ b/ase/include/ase/cmn/config.h.in @@ -1,4 +1,4 @@ -/* include/ase/cmn/conf_unx.h.in. Generated from configure.ac by autoheader. */ +/* include/ase/cmn/config.h.in. Generated from configure.ac by autoheader. */ /* char is mchar */ #undef ASE_CHAR_IS_MCHAR @@ -15,12 +15,6 @@ /* Unknown Endian */ #undef ASE_ENDIAN_UNKNOWN -/* long double */ -#undef ASE_HAVE_LONG_DOUBLE - -/* long long */ -#undef ASE_HAVE_LONG_LONG - /* author's email address */ #undef ASE_PKGAUTHOR diff --git a/ase/include/ase/cmn/makefile.am b/ase/include/ase/cmn/makefile.am index 7e35edc9..ae352eda 100644 --- a/ase/include/ase/cmn/makefile.am +++ b/ase/include/ase/cmn/makefile.am @@ -1,7 +1,10 @@ -pkginclude_HEADERS = conf_msw.h conf_unx.h conf_vms.h \ +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 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/types.h b/ase/include/ase/cmn/types.h index 3d8166a1..910ec7af 100644 --- a/ase/include/ase/cmn/types.h +++ b/ase/include/ase/cmn/types.h @@ -1,5 +1,5 @@ /* - * $Id: types.h 196 2008-06-08 14:04:16Z baconevi $ + * $Id: types.h 222 2008-06-26 05:48:54Z baconevi $ * * {License} */ @@ -26,7 +26,7 @@ #if !defined(__unix) #define __unix #endif - #include + #include #else #error unsupported operating system #endif diff --git a/ase/include/ase/lsp/makefile.in b/ase/include/ase/lsp/makefile.in index 24c1c9dc..55b6c4d3 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/ase/lib/awk/makefile.am b/ase/lib/awk/makefile.am index 4bf8d2ba..3e5bed0a 100644 --- a/ase/lib/awk/makefile.am +++ b/ase/lib/awk/makefile.am @@ -6,9 +6,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libaseawk.la libaseawk++.la libaseawk_la_SOURCES = awk.c err.c tree.c tab.c parse.c run.c rec.c val.c func.c misc.c extio.c awk_i.h extio.h func.h misc.h parse.h run.h tab.h tree.h -libaseawk_la_LDFLAGS= -L../cmn +libaseawk_la_LDFLAGS= -L../cmn -release $(VERSION) libaseawk_la_LIBADD= -lasecmn libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp -libaseawk___la_LDFLAGS = -L. +libaseawk___la_LDFLAGS = -L. -release $(VERSION) libaseawk___la_LIBADD = -laseawk diff --git a/ase/lib/awk/makefile.in b/ase/lib/awk/makefile.in index 74b16dff..b4ce1452 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -203,10 +203,10 @@ AUTOMAKE_OPTIONS = nostdinc AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libaseawk.la libaseawk++.la libaseawk_la_SOURCES = awk.c err.c tree.c tab.c parse.c run.c rec.c val.c func.c misc.c extio.c awk_i.h extio.h func.h misc.h parse.h run.h tab.h tree.h -libaseawk_la_LDFLAGS = -L../cmn +libaseawk_la_LDFLAGS = -L../cmn -release $(VERSION) libaseawk_la_LIBADD = -lasecmn libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp -libaseawk___la_LDFLAGS = -L. +libaseawk___la_LDFLAGS = -L. -release $(VERSION) libaseawk___la_LIBADD = -laseawk all: all-am diff --git a/ase/lib/cmn/makefile.am b/ase/lib/cmn/makefile.am index 8188522e..67140574 100644 --- a/ase/lib/cmn/makefile.am +++ b/ase/lib/cmn/makefile.am @@ -1,6 +1,8 @@ AUTOMAKE_OPTIONS = nostdinc AM_CFLAGS = -I$(top_builddir)/include + lib_LTLIBRARIES = libasecmn.la libasecmn_la_SOURCES = map.c mem.c misc.c rex.c str_bas.c str_cnv.c str_dyn.c +libasecmn_la_LDFLAGS = -release $(VERSION) diff --git a/ase/lib/cmn/makefile.in b/ase/lib/cmn/makefile.in index 6a416831..c435b3e0 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -192,6 +192,7 @@ AUTOMAKE_OPTIONS = nostdinc AM_CFLAGS = -I$(top_builddir)/include lib_LTLIBRARIES = libasecmn.la libasecmn_la_SOURCES = map.c mem.c misc.c rex.c str_bas.c str_cnv.c str_dyn.c +libasecmn_la_LDFLAGS = -release $(VERSION) all: all-am .SUFFIXES: diff --git a/ase/lib/lsp/makefile.am b/ase/lib/lsp/makefile.am index 61b24339..aee08806 100644 --- a/ase/lib/lsp/makefile.am +++ b/ase/lib/lsp/makefile.am @@ -6,5 +6,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libaselsp.la libaselsp_la_SOURCES = lsp.c err.c env.c eval.c mem.c mem.h misc.c name.c prim.c prim_compar.c prim.h prim_let.c prim_math.c prim_prog.c print.c read.c lsp_i.h env.h misc.h name.h obj.h -libaselsp_la_LDFLAGS = -L../cmn +libaselsp_la_LDFLAGS = -L../cmn -release $(VERSION) libaselsp_la_LIBADD = -lasecmn diff --git a/ase/lib/lsp/makefile.in b/ase/lib/lsp/makefile.in index ef9cfa8a..9cdac29f 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -193,7 +193,7 @@ AUTOMAKE_OPTIONS = nostdinc AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libaselsp.la libaselsp_la_SOURCES = lsp.c err.c env.c eval.c mem.c mem.h misc.c name.c prim.c prim_compar.c prim.h prim_let.c prim_math.c prim_prog.c print.c read.c lsp_i.h env.h misc.h name.h obj.h -libaselsp_la_LDFLAGS = -L../cmn +libaselsp_la_LDFLAGS = -L../cmn -release $(VERSION) libaselsp_la_LIBADD = -lasecmn all: all-am diff --git a/ase/lib/makefile.in b/ase/lib/makefile.in index fe59a27b..a55f02ad 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/ase/lib/utl/makefile.am b/ase/lib/utl/makefile.am index 4796f7a8..3ade971f 100644 --- a/ase/lib/utl/makefile.am +++ b/ase/lib/utl/makefile.am @@ -1,4 +1,6 @@ AM_CFLAGS = -I$(top_builddir)/include + lib_LTLIBRARIES = libaseutl.la libaseutl_la_SOURCES = assert.c ctype.c getopt.c http.c main.c stdio.c +libaseutl_la_LDFLAGS = -release $(VERSION) diff --git a/ase/lib/utl/makefile.in b/ase/lib/utl/makefile.in index cd0d7930..2ef72050 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -191,6 +191,7 @@ target_alias = @target_alias@ AM_CFLAGS = -I$(top_builddir)/include lib_LTLIBRARIES = libaseutl.la libaseutl_la_SOURCES = assert.c ctype.c getopt.c http.c main.c stdio.c +libaseutl_la_LDFLAGS = -release $(VERSION) all: all-am .SUFFIXES: diff --git a/ase/makefile.in b/ase/makefile.in index 28c85003..c3bd4fd3 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/conf_unx.h +CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h CONFIG_CLEAN_FILES = lib/tgp/makefile SOURCES = DIST_SOURCES =