From 8e3a0e2c840ceb90d76883ca7f9ac1ff1553b564 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sun, 22 Jun 2008 08:37:03 +0000 Subject: [PATCH] --- ase/cmd/awk/makefile.am | 9 +++-- ase/cmd/awk/makefile.in | 55 ++++++---------------------- ase/cmd/makefile.in | 1 + ase/configure | 65 +++++++++++++++++---------------- ase/configure.ac | 6 +-- ase/include/ase/lsp/makefile.in | 1 + ase/lib/awk/makefile.am | 6 ++- ase/lib/awk/makefile.in | 9 +++-- ase/lib/cmn/makefile.in | 1 + ase/lib/lsp/makefile.in | 1 + ase/lib/makefile.in | 1 + ase/lib/utl/makefile.in | 1 + ase/makefile.in | 1 + 13 files changed, 68 insertions(+), 89 deletions(-) diff --git a/ase/cmd/awk/makefile.am b/ase/cmd/awk/makefile.am index 3b4ca595..a88f5425 100644 --- a/ase/cmd/awk/makefile.am +++ b/ase/cmd/awk/makefile.am @@ -1,10 +1,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -bin_PROGRAMS = aseawk aseawk++ +bin_PROGRAMS = aseawk #aseawk++ aseawk_SOURCES = awk.c -aseawk___SOURCES = Awk.cpp +#aseawk___SOURCES = Awk.cpp -aseawk_LDADD = -L../../lib/cmn -L../../lib/awk -L../../lib/utl -laseutl -laseawk -lasecmn -aseawk___LDADD = -L../../lib/awk -laseawk++ +aseawk_LDFLAGS = -L../../lib/awk -L../../lib/utl +aseawk_LDADD = -laseutl -laseawk $(LIBM) +#aseawk___LDADD = -L../../lib/awk -laseawk++ diff --git a/ase/cmd/awk/makefile.in b/ase/cmd/awk/makefile.in index 4ebdb452..d9eb4eff 100644 --- a/ase/cmd/awk/makefile.in +++ b/ase/cmd/awk/makefile.in @@ -36,7 +36,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = aseawk$(EXEEXT) aseawk++$(EXEEXT) +bin_PROGRAMS = aseawk$(EXEEXT) subdir = cmd/awk DIST_COMMON = $(srcdir)/makefile.am $(srcdir)/makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -51,10 +51,8 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_aseawk_OBJECTS = awk.$(OBJEXT) aseawk_OBJECTS = $(am_aseawk_OBJECTS) -aseawk_DEPENDENCIES = -am_aseawk___OBJECTS = Awk.$(OBJEXT) -aseawk___OBJECTS = $(am_aseawk___OBJECTS) -aseawk___DEPENDENCIES = +am__DEPENDENCIES_1 = +aseawk_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase/cmn depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp am__depfiles_maybe = depfiles @@ -66,16 +64,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(aseawk_SOURCES) $(aseawk___SOURCES) -DIST_SOURCES = $(aseawk_SOURCES) $(aseawk___SOURCES) +SOURCES = $(aseawk_SOURCES) +DIST_SOURCES = $(aseawk_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -124,6 +114,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -194,13 +185,13 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AM_CPPFLAGS = -I$(top_srcdir)/include aseawk_SOURCES = awk.c -aseawk___SOURCES = Awk.cpp -aseawk_LDADD = -L../../lib/cmn -L../../lib/awk -L../../lib/utl -laseutl -laseawk -lasecmn -aseawk___LDADD = -L../../lib/awk -laseawk++ +#aseawk___SOURCES = Awk.cpp +aseawk_LDFLAGS = -L../../lib/awk -L../../lib/utl +aseawk_LDADD = -laseutl -laseawk $(LIBM) all: all-am .SUFFIXES: -.SUFFIXES: .c .cpp .lo .o .obj +.SUFFIXES: .c .lo .o .obj $(srcdir)/makefile.in: $(srcdir)/makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -261,9 +252,6 @@ clean-binPROGRAMS: aseawk$(EXEEXT): $(aseawk_OBJECTS) $(aseawk_DEPENDENCIES) @rm -f aseawk$(EXEEXT) $(LINK) $(aseawk_LDFLAGS) $(aseawk_OBJECTS) $(aseawk_LDADD) $(LIBS) -aseawk++$(EXEEXT): $(aseawk___OBJECTS) $(aseawk___DEPENDENCIES) - @rm -f aseawk++$(EXEEXT) - $(CXXLINK) $(aseawk___LDFLAGS) $(aseawk___OBJECTS) $(aseawk___LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -271,7 +259,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Awk.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/awk.Po@am__quote@ .c.o: @@ -295,27 +282,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -.cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - mostlyclean-libtool: -rm -f *.lo @@ -494,6 +460,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am pdf pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-info-am +#aseawk___LDADD = -L../../lib/awk -laseawk++ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/ase/cmd/makefile.in b/ase/cmd/makefile.in index 1b0a4905..a4900b86 100644 --- a/ase/cmd/makefile.in +++ b/ase/cmd/makefile.in @@ -100,6 +100,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/ase/configure b/ase/configure index 4dde35cd..ebbdf003 100755 --- a/ase/configure +++ b/ase/configure @@ -880,6 +880,7 @@ JAR BUILD_JNI CJFLAGS BUILD_CJ +LIBM LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -4301,7 +4302,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4304 "configure"' > conftest.$ac_ext + echo '#line 4305 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7033,11 +7034,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:7036: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7037: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7040: \$? = $ac_status" >&5 + echo "$as_me:7041: \$? = $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. @@ -7301,11 +7302,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:7304: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7305: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7308: \$? = $ac_status" >&5 + echo "$as_me:7309: \$? = $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. @@ -7405,11 +7406,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:7408: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7409: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7412: \$? = $ac_status" >&5 + echo "$as_me:7413: \$? = $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 @@ -8870,7 +8871,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8873 "configure"' > conftest.$ac_ext + echo '#line 8874 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9734,7 +9735,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:12177: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12180: \$? = $ac_status" >&5 + echo "$as_me:12181: \$? = $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. @@ -12277,11 +12278,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:12280: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12281: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12284: \$? = $ac_status" >&5 + echo "$as_me:12285: \$? = $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 @@ -12813,7 +12814,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12816 "configure"' > conftest.$ac_ext + echo '#line 12817 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13871,11 +13872,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:13874: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13875: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13878: \$? = $ac_status" >&5 + echo "$as_me:13879: \$? = $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. @@ -13975,11 +13976,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:13978: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13979: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13982: \$? = $ac_status" >&5 + echo "$as_me:13983: \$? = $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 @@ -15420,7 +15421,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15423 "configure"' > conftest.$ac_ext + echo '#line 15424 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -16197,11 +16198,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:16200: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16201: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16204: \$? = $ac_status" >&5 + echo "$as_me:16205: \$? = $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. @@ -16465,11 +16466,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:16468: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16469: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16472: \$? = $ac_status" >&5 + echo "$as_me:16473: \$? = $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. @@ -16569,11 +16570,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:16572: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16573: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16576: \$? = $ac_status" >&5 + echo "$as_me:16577: \$? = $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 @@ -18034,7 +18035,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 18037 "configure"' > conftest.$ac_ext + echo '#line 18038 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -19592,8 +19593,6 @@ fi # Do we need libm for math functions? { echo "$as_me:$LINENO: checking for libm math function in std libs" >&5 echo $ECHO_N "checking for libm math function in std libs... $ECHO_C" >&6; } -OCFL="$CFLAGS" -CFLAGS="-Werror $CFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19644,7 +19643,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -CFLAGS="$OCFL" if test "$needlibm" = "yes"; then { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -19710,7 +19708,7 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5 echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; } if test $ac_cv_lib_m_pow = yes; then - LIBS="$LIBS -lm" + LIBM="-lm" else { { echo "$as_me:$LINENO: error: libm is needed and is not available" >&5 echo "$as_me: error: libm is needed and is not available" >&2;} @@ -26736,6 +26734,8 @@ CJFLAGS=$CJFLAGS BUILD_CJ=$BUILD_CJ +LIBM=$LIBM + ac_config_files="$ac_config_files makefile include/makefile include/ase/makefile include/ase/cmn/makefile include/ase/awk/makefile include/ase/lsp/makefile include/ase/utl/makefile lib/makefile lib/cmn/makefile lib/awk/makefile lib/lsp/makefile lib/tgp/makefile lib/utl/makefile cmd/makefile cmd/awk/makefile cmd/lsp/makefile" @@ -27555,11 +27555,12 @@ JAR!$JAR$ac_delim BUILD_JNI!$BUILD_JNI$ac_delim CJFLAGS!$CJFLAGS$ac_delim BUILD_CJ!$BUILD_CJ$ac_delim +LIBM!$LIBM$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` = 17; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; 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 526f2f80..c31ee33d 100644 --- a/ase/configure.ac +++ b/ase/configure.ac @@ -59,8 +59,6 @@ fi # Do we need libm for math functions? AC_MSG_CHECKING([for libm math function in std libs]) -OCFL="$CFLAGS" -CFLAGS="-Werror $CFLAGS" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include @@ -69,11 +67,10 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ pow(x, x); return 0; ]])],[needlibm=no],[needlibm=yes]) -CFLAGS="$OCFL" if test "$needlibm" = "yes"; then AC_MSG_RESULT([no]) AC_CHECK_LIB([m], [pow], - LIBS="$LIBS -lm", + LIBM="-lm", AC_MSG_ERROR([libm is needed and is not available])) else AC_MSG_RESULT([yes]) @@ -283,6 +280,7 @@ AC_SUBST(JAR, $JAR_PATH) AC_SUBST(BUILD_JNI, $BUILD_JNI) AC_SUBST(CJFLAGS, $CJFLAGS) AC_SUBST(BUILD_CJ, $BUILD_CJ) +AC_SUBST(LIBM, $LIBM) AC_CONFIG_FILES([ makefile diff --git a/ase/include/ase/lsp/makefile.in b/ase/include/ase/lsp/makefile.in index fc26c454..24c1c9dc 100644 --- a/ase/include/ase/lsp/makefile.in +++ b/ase/include/ase/lsp/makefile.in @@ -105,6 +105,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/ase/lib/awk/makefile.am b/ase/lib/awk/makefile.am index da5adedc..47b68ec6 100644 --- a/ase/lib/awk/makefile.am +++ b/ase/lib/awk/makefile.am @@ -5,7 +5,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 jni.h misc.h parse.h run.h tab.h tree.h +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_LIBADD= -lasecmn libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp -#libaesawkcxx_la_LIBADD = -laseawk +#libaesawk___la_LIBADD = -L. -laseawk diff --git a/ase/lib/awk/makefile.in b/ase/lib/awk/makefile.in index 67985116..b9a7a2a6 100644 --- a/ase/lib/awk/makefile.in +++ b/ase/lib/awk/makefile.in @@ -57,7 +57,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libaseawk___la_LIBADD = am_libaseawk___la_OBJECTS = Awk.lo StdAwk.lo libaseawk___la_OBJECTS = $(am_libaseawk___la_OBJECTS) -libaseawk_la_LIBADD = +libaseawk_la_DEPENDENCIES = am_libaseawk_la_OBJECTS = awk.lo err.lo tree.lo tab.lo parse.lo run.lo \ rec.lo val.lo func.lo misc.lo extio.lo libaseawk_la_OBJECTS = $(am_libaseawk_la_OBJECTS) @@ -130,6 +130,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -201,7 +202,9 @@ target_alias = @target_alias@ 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 jni.h misc.h parse.h run.h tab.h tree.h +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_LIBADD = -lasecmn libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp all: all-am @@ -510,7 +513,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES tags uninstall uninstall-am uninstall-info-am \ uninstall-libLTLIBRARIES -#libaesawkcxx_la_LIBADD = -laseawk +#libaesawk___la_LIBADD = -L. -laseawk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/ase/lib/cmn/makefile.in b/ase/lib/cmn/makefile.in index ea6f9e26..6a416831 100644 --- a/ase/lib/cmn/makefile.in +++ b/ase/lib/cmn/makefile.in @@ -119,6 +119,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/ase/lib/lsp/makefile.in b/ase/lib/lsp/makefile.in index 914b54ee..e2464316 100644 --- a/ase/lib/lsp/makefile.in +++ b/ase/lib/lsp/makefile.in @@ -120,6 +120,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/ase/lib/makefile.in b/ase/lib/makefile.in index 9dab3f43..fe59a27b 100644 --- a/ase/lib/makefile.in +++ b/ase/lib/makefile.in @@ -100,6 +100,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/ase/lib/utl/makefile.in b/ase/lib/utl/makefile.in index 622574ee..cd0d7930 100644 --- a/ase/lib/utl/makefile.in +++ b/ase/lib/utl/makefile.in @@ -119,6 +119,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/ase/makefile.in b/ase/makefile.in index 2654c9f3..7212ec10 100644 --- a/ase/makefile.in +++ b/ase/makefile.in @@ -124,6 +124,7 @@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@