fixed Makefile.am not to link unicosw in the mchar mode

This commit is contained in:
hyung-hwan 2012-08-20 15:08:06 +00:00
parent a2b51062a9
commit 5033596aee
8 changed files with 36 additions and 9 deletions

View File

@ -14,8 +14,10 @@ qseawk_LDFLAGS = -L../../lib/awk -L../../lib/cmn -L$(libdir)
qseawk_LDADD = -lqseawk -lqsecmn $(LIBM) qseawk_LDADD = -lqseawk -lqsecmn $(LIBM)
if WIN32 if WIN32
if WCHAR
qseawk_LDADD += $(UNICOWS_LIBS) qseawk_LDADD += $(UNICOWS_LIBS)
endif endif
endif
#####################################################################3 #####################################################################3
@ -28,7 +30,9 @@ qseawkmp_LDFLAGS = -L../../lib/awk -L../../lib/cmn -L$(libdir) $(MPI_CLDFLAGS)
qseawkmp_LDADD = -lqseawkmp -lqseawk -lqsecmn $(LIBM) qseawkmp_LDADD = -lqseawkmp -lqseawk -lqsecmn $(LIBM)
if WIN32 if WIN32
if WCHAR
qseawkmp_LDADD += $(UNICOWS_LIBS) qseawkmp_LDADD += $(UNICOWS_LIBS)
endif endif
endif
endif endif

View File

@ -35,11 +35,11 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
bin_PROGRAMS = qseawk$(EXEEXT) $(am__EXEEXT_1) bin_PROGRAMS = qseawk$(EXEEXT) $(am__EXEEXT_1)
@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS) @WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS)
#####################################################################3 #####################################################################3
@HAVE_C_MPI_TRUE@am__append_2 = qseawkmp @HAVE_C_MPI_TRUE@am__append_2 = qseawkmp
@HAVE_C_MPI_TRUE@@WIN32_TRUE@am__append_3 = $(UNICOWS_LIBS) @HAVE_C_MPI_TRUE@@WCHAR_TRUE@@WIN32_TRUE@am__append_3 = $(UNICOWS_LIBS)
subdir = cmd/awk subdir = cmd/awk
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -60,7 +60,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_qseawk_OBJECTS = awk.$(OBJEXT) am_qseawk_OBJECTS = awk.$(OBJEXT)
qseawk_OBJECTS = $(am_qseawk_OBJECTS) qseawk_OBJECTS = $(am_qseawk_OBJECTS)
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @WCHAR_TRUE@@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
qseawk_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) qseawk_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
qseawk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ qseawk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qseawk_LDFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qseawk_LDFLAGS) \
@ -68,8 +68,7 @@ qseawk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
am__qseawkmp_SOURCES_DIST = mpi.c am__qseawkmp_SOURCES_DIST = mpi.c
@HAVE_C_MPI_TRUE@am_qseawkmp_OBJECTS = qseawkmp-mpi.$(OBJEXT) @HAVE_C_MPI_TRUE@am_qseawkmp_OBJECTS = qseawkmp-mpi.$(OBJEXT)
qseawkmp_OBJECTS = $(am_qseawkmp_OBJECTS) qseawkmp_OBJECTS = $(am_qseawkmp_OBJECTS)
@HAVE_C_MPI_TRUE@@WIN32_TRUE@am__DEPENDENCIES_3 = \ @HAVE_C_MPI_TRUE@@WCHAR_TRUE@@WIN32_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
@HAVE_C_MPI_TRUE@@WIN32_TRUE@ $(am__DEPENDENCIES_1)
@HAVE_C_MPI_TRUE@qseawkmp_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @HAVE_C_MPI_TRUE@qseawkmp_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@HAVE_C_MPI_TRUE@ $(am__DEPENDENCIES_3) @HAVE_C_MPI_TRUE@ $(am__DEPENDENCIES_3)
qseawkmp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ qseawkmp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

View File

@ -12,5 +12,7 @@ qsesed_LDFLAGS = -L../../lib/sed -L../../lib/cmn -L$(libdir)
qsesed_LDADD = -lqsesed -lqsecmn qsesed_LDADD = -lqsesed -lqsecmn
if WIN32 if WIN32
if WCHAR
qsesed_LDADD += $(UNICOWS_LIBS) qsesed_LDADD += $(UNICOWS_LIBS)
endif endif
endif

View File

@ -35,7 +35,7 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
bin_PROGRAMS = qsesed$(EXEEXT) bin_PROGRAMS = qsesed$(EXEEXT)
@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS) @WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS)
subdir = cmd/sed subdir = cmd/sed
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -55,7 +55,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_qsesed_OBJECTS = sed.$(OBJEXT) am_qsesed_OBJECTS = sed.$(OBJEXT)
qsesed_OBJECTS = $(am_qsesed_OBJECTS) qsesed_OBJECTS = $(am_qsesed_OBJECTS)
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @WCHAR_TRUE@@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
qsesed_DEPENDENCIES = $(am__DEPENDENCIES_2) qsesed_DEPENDENCIES = $(am__DEPENDENCIES_2)
qsesed_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ qsesed_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qsesed_LDFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qsesed_LDFLAGS) \

View File

@ -929,5 +929,6 @@ int qse_main (int argc, qse_achar_t* argv[])
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
qse_setdflcmgr (qse_slmbcmgr); qse_setdflcmgr (qse_slmbcmgr);
#endif #endif
return qse_runmain (argc, argv, sed_main); return qse_runmain (argc, argv, sed_main);
} }

14
qse/configure vendored
View File

@ -634,6 +634,8 @@ ax_pthread_config
ENABLE_CXX_FALSE ENABLE_CXX_FALSE
ENABLE_CXX_TRUE ENABLE_CXX_TRUE
BUILD_MODE BUILD_MODE
WCHAR_FALSE
WCHAR_TRUE
CHAR_MODE CHAR_MODE
HAVE_C_MPI_FALSE HAVE_C_MPI_FALSE
HAVE_C_MPI_TRUE HAVE_C_MPI_TRUE
@ -18439,6 +18441,14 @@ $as_echo "#define QSE_CHAR_IS_MCHAR /**/" >>confdefs.h
CHAR_MODE="QSE_CHAR_IS_MCHAR" CHAR_MODE="QSE_CHAR_IS_MCHAR"
fi fi
if test "${enable_wchar_is}" = "yes" ; then
WCHAR_TRUE=
WCHAR_FALSE='#'
else
WCHAR_TRUE='#'
WCHAR_FALSE=
fi
# Check whether --enable-syscall was given. # Check whether --enable-syscall was given.
if test "${enable_syscall+set}" = set; then : if test "${enable_syscall+set}" = set; then :
@ -19108,6 +19118,10 @@ if test -z "${HAVE_C_MPI_TRUE}" && test -z "${HAVE_C_MPI_FALSE}"; then
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${WCHAR_TRUE}" && test -z "${WCHAR_FALSE}"; then
as_fn_error $? "conditional \"WCHAR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_CXX_TRUE}" && test -z "${ENABLE_CXX_FALSE}"; then if test -z "${ENABLE_CXX_TRUE}" && test -z "${ENABLE_CXX_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_CXX\" was never defined. as_fn_error $? "conditional \"ENABLE_CXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5

View File

@ -282,6 +282,7 @@ else
AC_DEFINE([QSE_CHAR_IS_MCHAR],[],[char is mchar]) AC_DEFINE([QSE_CHAR_IS_MCHAR],[],[char is mchar])
AC_SUBST(CHAR_MODE, "QSE_CHAR_IS_MCHAR") AC_SUBST(CHAR_MODE, "QSE_CHAR_IS_MCHAR")
fi fi
AM_CONDITIONAL(WCHAR, test "${enable_wchar_is}" = "yes" )
AC_ARG_ENABLE([syscall], [AS_HELP_STRING([--enable-syscall],[use the syscall() function to call system calls (default. no)])], AC_ARG_ENABLE([syscall], [AS_HELP_STRING([--enable-syscall],[use the syscall() function to call system calls (default. no)])],
enable_syscall_is=$enableval,enable_syscall_is=no) enable_syscall_is=$enableval,enable_syscall_is=no)

View File

@ -75,6 +75,12 @@
# define QSE_PRIVATE # define QSE_PRIVATE
#endif #endif
#if defined(__GNUC__)
# define QSE_OPTIMIZE_NEVER __attribute__((optimize("O0")))
#else
# define QSE_OPTIMIZE_NEVER
#endif
/** /**
* The QSE_SIZEOF() macro gets data size in bytes. It is equivalent to the * The QSE_SIZEOF() macro gets data size in bytes. It is equivalent to the
* sizeof operator. The following code snippet should print sizeof(int)*128. * sizeof operator. The following code snippet should print sizeof(int)*128.