diff --git a/ase/cmd/awk/makefile.in b/ase/cmd/awk/makefile.in index d34aab83..6649b04b 100644 --- a/ase/cmd/awk/makefile.in +++ b/ase/cmd/awk/makefile.in @@ -116,6 +116,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/cmd/lsp/makefile.in b/ase/cmd/lsp/makefile.in index 378e7b7e..bb79eda6 100644 --- a/ase/cmd/lsp/makefile.in +++ b/ase/cmd/lsp/makefile.in @@ -105,6 +105,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/cmd/makefile.in b/ase/cmd/makefile.in index 65f12d0e..25ad9beb 100644 --- a/ase/cmd/makefile.in +++ b/ase/cmd/makefile.in @@ -91,6 +91,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/cmd/tgp/makefile.in b/ase/cmd/tgp/makefile.in index d80181de..61bd3d65 100644 --- a/ase/cmd/tgp/makefile.in +++ b/ase/cmd/tgp/makefile.in @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/configure b/ase/configure index 31ec7111..987c5b31 100755 --- a/ase/configure +++ b/ase/configure @@ -882,6 +882,8 @@ JAR BUILD_JNI CJFLAGS BUILD_CJ +HAVE_CXX_TRUE +HAVE_CXX_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -4303,7 +4305,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4306 "configure"' > conftest.$ac_ext + echo '#line 4308 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7035,11 +7037,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:7038: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7040: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7042: \$? = $ac_status" >&5 + echo "$as_me:7044: \$? = $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. @@ -7303,11 +7305,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:7306: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7308: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7310: \$? = $ac_status" >&5 + echo "$as_me:7312: \$? = $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. @@ -7407,11 +7409,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:7410: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7412: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7414: \$? = $ac_status" >&5 + echo "$as_me:7416: \$? = $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 @@ -8872,7 +8874,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8875 "configure"' > conftest.$ac_ext + echo '#line 8877 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9736,7 +9738,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:12180: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12182: \$? = $ac_status" >&5 + echo "$as_me:12184: \$? = $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. @@ -12279,11 +12281,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:12282: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12284: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12286: \$? = $ac_status" >&5 + echo "$as_me:12288: \$? = $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 @@ -12815,7 +12817,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12818 "configure"' > conftest.$ac_ext + echo '#line 12820 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13873,11 +13875,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:13876: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13878: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13880: \$? = $ac_status" >&5 + echo "$as_me:13882: \$? = $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. @@ -13977,11 +13979,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:13980: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13982: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13984: \$? = $ac_status" >&5 + echo "$as_me:13986: \$? = $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 @@ -15422,7 +15424,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15425 "configure"' > conftest.$ac_ext + echo '#line 15427 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -16199,11 +16201,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:16202: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16204: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16206: \$? = $ac_status" >&5 + echo "$as_me:16208: \$? = $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. @@ -16467,11 +16469,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:16470: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16472: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16474: \$? = $ac_status" >&5 + echo "$as_me:16476: \$? = $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. @@ -16571,11 +16573,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:16574: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16576: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16578: \$? = $ac_status" >&5 + echo "$as_me:16580: \$? = $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 @@ -18036,7 +18038,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 18039 "configure"' > conftest.$ac_ext + echo '#line 18041 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -26764,6 +26766,30 @@ CJFLAGS=$CJFLAGS BUILD_CJ=$BUILD_CJ +if test -n "${CXX}"; then + + +if true; then + HAVE_CXX_TRUE= + HAVE_CXX_FALSE='#' +else + HAVE_CXX_TRUE='#' + HAVE_CXX_FALSE= +fi + +else + + +if false; then + HAVE_CXX_TRUE= + HAVE_CXX_FALSE='#' +else + HAVE_CXX_TRUE='#' + HAVE_CXX_FALSE= +fi + +fi + 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/tgp/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 cmd/tgp/makefile" cat >confcache <<\_ACEOF @@ -26883,6 +26909,20 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -27586,11 +27626,13 @@ JAR!$JAR$ac_delim BUILD_JNI!$BUILD_JNI$ac_delim CJFLAGS!$CJFLAGS$ac_delim BUILD_CJ!$BUILD_CJ$ac_delim +HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim +HAVE_CXX_FALSE!$HAVE_CXX_FALSE$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` = 19; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; 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 a5ef2c14..fa2d7769 100644 --- a/ase/configure.ac +++ b/ase/configure.ac @@ -271,6 +271,12 @@ AC_SUBST(BUILD_JNI, $BUILD_JNI) AC_SUBST(CJFLAGS, $CJFLAGS) AC_SUBST(BUILD_CJ, $BUILD_CJ) +if test -n "${CXX}"; then + AM_CONDITIONAL(HAVE_CXX,true) +else + AM_CONDITIONAL(HAVE_CXX,false) +fi + AC_CONFIG_FILES([ makefile include/makefile diff --git a/ase/include/ase/awk/makefile.in b/ase/include/ase/awk/makefile.in index b72d7f66..b978b6ae 100644 --- a/ase/include/ase/awk/makefile.in +++ b/ase/include/ase/awk/makefile.in @@ -96,6 +96,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/include/ase/cmn/makefile.in b/ase/include/ase/cmn/makefile.in index adcad6ce..e3c2ede7 100644 --- a/ase/include/ase/cmn/makefile.in +++ b/ase/include/ase/cmn/makefile.in @@ -96,6 +96,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/include/ase/lsp/makefile.in b/ase/include/ase/lsp/makefile.in index 4e580f91..80d59c3c 100644 --- a/ase/include/ase/lsp/makefile.in +++ b/ase/include/ase/lsp/makefile.in @@ -96,6 +96,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/include/ase/makefile.in b/ase/include/ase/makefile.in index f9ae9def..effdaea6 100644 --- a/ase/include/ase/makefile.in +++ b/ase/include/ase/makefile.in @@ -103,6 +103,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/include/ase/tgp/makefile.in b/ase/include/ase/tgp/makefile.in index 7e4899ff..af973e8a 100644 --- a/ase/include/ase/tgp/makefile.in +++ b/ase/include/ase/tgp/makefile.in @@ -96,6 +96,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/include/ase/utl/makefile.in b/ase/include/ase/utl/makefile.in index a2819b01..7b450c6c 100644 --- a/ase/include/ase/utl/makefile.in +++ b/ase/include/ase/utl/makefile.in @@ -96,6 +96,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/include/makefile.in b/ase/include/makefile.in index 551ceeb0..cac99c3b 100644 --- a/ase/include/makefile.in +++ b/ase/include/makefile.in @@ -94,6 +94,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/lib/awk/makefile.am b/ase/lib/awk/makefile.am index bffb79d3..d9d78566 100644 --- a/ase/lib/awk/makefile.am +++ b/ase/lib/awk/makefile.am @@ -3,12 +3,14 @@ AUTOMAKE_OPTIONS = nostdinc AM_CPPFLAGS = -I$(top_srcdir)/include -lib_LTLIBRARIES = libaseawk.la libaseawk++.la - +lib_LTLIBRARIES = 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 -version-info 1:0:0 libaseawk_la_LIBADD= -lasecmn +if HAVE_CXX +lib_LTLIBRARIES += libaseawk++.la libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp libaseawk___la_LDFLAGS = -L. -version-info 1:0:0 libaseawk___la_LIBADD = -laseawk +endif diff --git a/ase/lib/awk/makefile.in b/ase/lib/awk/makefile.in index 0351fcc7..4419d054 100644 --- a/ase/lib/awk/makefile.in +++ b/ase/lib/awk/makefile.in @@ -36,6 +36,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_CXX_TRUE@am__append_1 = libaseawk++.la subdir = lib/awk DIST_COMMON = $(srcdir)/makefile.am $(srcdir)/makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -55,8 +56,10 @@ am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libaseawk___la_DEPENDENCIES = -am_libaseawk___la_OBJECTS = Awk.lo StdAwk.lo +am__libaseawk___la_SOURCES_DIST = Awk.cpp StdAwk.cpp +@HAVE_CXX_TRUE@am_libaseawk___la_OBJECTS = Awk.lo StdAwk.lo libaseawk___la_OBJECTS = $(am_libaseawk___la_OBJECTS) +@HAVE_CXX_TRUE@am_libaseawk___la_rpath = -rpath $(libdir) 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 @@ -81,7 +84,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libaseawk___la_SOURCES) $(libaseawk_la_SOURCES) -DIST_SOURCES = $(libaseawk___la_SOURCES) $(libaseawk_la_SOURCES) +DIST_SOURCES = $(am__libaseawk___la_SOURCES_DIST) \ + $(libaseawk_la_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -121,6 +125,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -202,13 +208,13 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = nostdinc AM_CPPFLAGS = -I$(top_srcdir)/include -lib_LTLIBRARIES = libaseawk.la libaseawk++.la +lib_LTLIBRARIES = libaseawk.la $(am__append_1) 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 -version-info 1:0:0 libaseawk_la_LIBADD = -lasecmn -libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp -libaseawk___la_LDFLAGS = -L. -version-info 1:0:0 -libaseawk___la_LIBADD = -laseawk +@HAVE_CXX_TRUE@libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp +@HAVE_CXX_TRUE@libaseawk___la_LDFLAGS = -L. -version-info 1:0:0 +@HAVE_CXX_TRUE@libaseawk___la_LIBADD = -laseawk all: all-am .SUFFIXES: @@ -270,7 +276,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libaseawk++.la: $(libaseawk___la_OBJECTS) $(libaseawk___la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libaseawk___la_LDFLAGS) $(libaseawk___la_OBJECTS) $(libaseawk___la_LIBADD) $(LIBS) + $(CXXLINK) $(am_libaseawk___la_rpath) $(libaseawk___la_LDFLAGS) $(libaseawk___la_OBJECTS) $(libaseawk___la_LIBADD) $(LIBS) libaseawk.la: $(libaseawk_la_OBJECTS) $(libaseawk_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libaseawk_la_LDFLAGS) $(libaseawk_la_OBJECTS) $(libaseawk_la_LIBADD) $(LIBS) diff --git a/ase/lib/cmn/makefile.in b/ase/lib/cmn/makefile.in index 96f50884..751485a6 100644 --- a/ase/lib/cmn/makefile.in +++ b/ase/lib/cmn/makefile.in @@ -110,6 +110,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/lib/lsp/makefile.in b/ase/lib/lsp/makefile.in index 7028ecff..8a577fcf 100644 --- a/ase/lib/lsp/makefile.in +++ b/ase/lib/lsp/makefile.in @@ -111,6 +111,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/lib/makefile.in b/ase/lib/makefile.in index 697c0748..3b2b41d8 100644 --- a/ase/lib/makefile.in +++ b/ase/lib/makefile.in @@ -91,6 +91,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/lib/tgp/makefile.in b/ase/lib/tgp/makefile.in index 276df596..70c02d02 100644 --- a/ase/lib/tgp/makefile.in +++ b/ase/lib/tgp/makefile.in @@ -109,6 +109,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/lib/utl/makefile.in b/ase/lib/utl/makefile.in index 91483d78..e1a94cb7 100644 --- a/ase/lib/utl/makefile.in +++ b/ase/lib/utl/makefile.in @@ -110,6 +110,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/ase/makefile.in b/ase/makefile.in index 5f41b123..f0c6158d 100644 --- a/ase/makefile.in +++ b/ase/makefile.in @@ -113,6 +113,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@