From 87e3601818bbe436abf9a8c64966b86f8510cb1a Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 19 Aug 2020 04:56:50 +0000 Subject: [PATCH] removed unneeded substitution in configure.ac --- hawk/Makefile.in | 12 ------------ hawk/bin/Makefile.in | 12 ------------ hawk/configure | 37 ------------------------------------- hawk/configure.ac | 14 +------------- hawk/lib/Makefile.in | 12 ------------ hawk/lib/hawk-cmn.h | 4 ++-- hawk/mod/Makefile.in | 12 ------------ hawk/samples/Makefile.in | 12 ------------ hawk/t/Makefile.in | 12 ------------ hawk/tools/Makefile.in | 12 ------------ 10 files changed, 3 insertions(+), 136 deletions(-) diff --git a/hawk/Makefile.in b/hawk/Makefile.in index c4429ce9..33cffa54 100644 --- a/hawk/Makefile.in +++ b/hawk/Makefile.in @@ -252,18 +252,6 @@ HAVE_CXX = @HAVE_CXX@ HAVE_CXX11 = @HAVE_CXX11@ HAWK_PROJECT_AUTHOR = @HAWK_PROJECT_AUTHOR@ HAWK_PROJECT_URL = @HAWK_PROJECT_URL@ -HAWK_SIZEOF_CHAR = @HAWK_SIZEOF_CHAR@ -HAWK_SIZEOF_DOUBLE = @HAWK_SIZEOF_DOUBLE@ -HAWK_SIZEOF_FLOAT = @HAWK_SIZEOF_FLOAT@ -HAWK_SIZEOF_INT = @HAWK_SIZEOF_INT@ -HAWK_SIZEOF_LONG = @HAWK_SIZEOF_LONG@ -HAWK_SIZEOF_LONG_DOUBLE = @HAWK_SIZEOF_LONG_DOUBLE@ -HAWK_SIZEOF_LONG_LONG = @HAWK_SIZEOF_LONG_LONG@ -HAWK_SIZEOF_OFF64_T = @HAWK_SIZEOF_OFF64_T@ -HAWK_SIZEOF_OFF_T = @HAWK_SIZEOF_OFF_T@ -HAWK_SIZEOF_SHORT = @HAWK_SIZEOF_SHORT@ -HAWK_SIZEOF_VOID_P = @HAWK_SIZEOF_VOID_P@ -HAWK_SIZEOF_WCHAR_T = @HAWK_SIZEOF_WCHAR_T@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/hawk/bin/Makefile.in b/hawk/bin/Makefile.in index b9e8cb63..bf28774e 100644 --- a/hawk/bin/Makefile.in +++ b/hawk/bin/Makefile.in @@ -221,18 +221,6 @@ HAVE_CXX = @HAVE_CXX@ HAVE_CXX11 = @HAVE_CXX11@ HAWK_PROJECT_AUTHOR = @HAWK_PROJECT_AUTHOR@ HAWK_PROJECT_URL = @HAWK_PROJECT_URL@ -HAWK_SIZEOF_CHAR = @HAWK_SIZEOF_CHAR@ -HAWK_SIZEOF_DOUBLE = @HAWK_SIZEOF_DOUBLE@ -HAWK_SIZEOF_FLOAT = @HAWK_SIZEOF_FLOAT@ -HAWK_SIZEOF_INT = @HAWK_SIZEOF_INT@ -HAWK_SIZEOF_LONG = @HAWK_SIZEOF_LONG@ -HAWK_SIZEOF_LONG_DOUBLE = @HAWK_SIZEOF_LONG_DOUBLE@ -HAWK_SIZEOF_LONG_LONG = @HAWK_SIZEOF_LONG_LONG@ -HAWK_SIZEOF_OFF64_T = @HAWK_SIZEOF_OFF64_T@ -HAWK_SIZEOF_OFF_T = @HAWK_SIZEOF_OFF_T@ -HAWK_SIZEOF_SHORT = @HAWK_SIZEOF_SHORT@ -HAWK_SIZEOF_VOID_P = @HAWK_SIZEOF_VOID_P@ -HAWK_SIZEOF_WCHAR_T = @HAWK_SIZEOF_WCHAR_T@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/hawk/configure b/hawk/configure index ba3d132a..14e93367 100755 --- a/hawk/configure +++ b/hawk/configure @@ -637,18 +637,6 @@ LTLIBOBJS LIBOBJS HAWK_PROJECT_URL HAWK_PROJECT_AUTHOR -HAWK_SIZEOF_OFF64_T -HAWK_SIZEOF_OFF_T -HAWK_SIZEOF_LONG_DOUBLE -HAWK_SIZEOF_DOUBLE -HAWK_SIZEOF_FLOAT -HAWK_SIZEOF_VOID_P -HAWK_SIZEOF_CHAR -HAWK_SIZEOF_SHORT -HAWK_SIZEOF_INT -HAWK_SIZEOF_LONG -HAWK_SIZEOF_LONG_LONG -HAWK_SIZEOF_WCHAR_T ENABLE_MOD_UCI_FALSE ENABLE_MOD_UCI_TRUE ENABLE_MOD_MYSQL_FALSE @@ -24185,31 +24173,6 @@ then LIBS="$LIBS $PTHREAD_LIBS" fi -HAWK_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t - -HAWK_SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long - -HAWK_SIZEOF_LONG=$ac_cv_sizeof_long - -HAWK_SIZEOF_INT=$ac_cv_sizeof_int - -HAWK_SIZEOF_SHORT=$ac_cv_sizeof_short - -HAWK_SIZEOF_CHAR=$ac_cv_sizeof_char - -HAWK_SIZEOF_VOID_P=$ac_cv_sizeof_void_p - -HAWK_SIZEOF_FLOAT=$ac_cv_sizeof_float - -HAWK_SIZEOF_DOUBLE=$ac_cv_sizeof_double - -HAWK_SIZEOF_LONG_DOUBLE=$ac_cv_sizeof_long_double - -HAWK_SIZEOF_OFF_T=$ac_cv_sizeof_off_t - -HAWK_SIZEOF_OFF64_T=$ac_cv_sizeof_off64_t - - HAWK_PROJECT_AUTHOR="${PACKAGE_BUGREPORT}" HAWK_PROJECT_URL="${PACKAGE_URL}" diff --git a/hawk/configure.ac b/hawk/configure.ac index 39829c81..cec964c8 100644 --- a/hawk/configure.ac +++ b/hawk/configure.ac @@ -1012,19 +1012,7 @@ then [LIBS="$LIBS $PTHREAD_LIBS"] fi -AC_SUBST(HAWK_SIZEOF_WCHAR_T, $ac_cv_sizeof_wchar_t) -AC_SUBST(HAWK_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long) -AC_SUBST(HAWK_SIZEOF_LONG, $ac_cv_sizeof_long) -AC_SUBST(HAWK_SIZEOF_INT, $ac_cv_sizeof_int) -AC_SUBST(HAWK_SIZEOF_SHORT, $ac_cv_sizeof_short) -AC_SUBST(HAWK_SIZEOF_CHAR, $ac_cv_sizeof_char) -AC_SUBST(HAWK_SIZEOF_VOID_P, $ac_cv_sizeof_void_p) -AC_SUBST(HAWK_SIZEOF_FLOAT, $ac_cv_sizeof_float) -AC_SUBST(HAWK_SIZEOF_DOUBLE, $ac_cv_sizeof_double) -AC_SUBST(HAWK_SIZEOF_LONG_DOUBLE, $ac_cv_sizeof_long_double) -AC_SUBST(HAWK_SIZEOF_OFF_T, $ac_cv_sizeof_off_t) -AC_SUBST(HAWK_SIZEOF_OFF64_T, $ac_cv_sizeof_off64_t) - +dnl ==== subsititution of some key items ==== AC_SUBST(HAWK_PROJECT_AUTHOR, "${PACKAGE_BUGREPORT}") AC_SUBST(HAWK_PROJECT_URL, "${PACKAGE_URL}") diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in index 9df318db..f3d5f09f 100644 --- a/hawk/lib/Makefile.in +++ b/hawk/lib/Makefile.in @@ -444,18 +444,6 @@ HAVE_CXX = @HAVE_CXX@ HAVE_CXX11 = @HAVE_CXX11@ HAWK_PROJECT_AUTHOR = @HAWK_PROJECT_AUTHOR@ HAWK_PROJECT_URL = @HAWK_PROJECT_URL@ -HAWK_SIZEOF_CHAR = @HAWK_SIZEOF_CHAR@ -HAWK_SIZEOF_DOUBLE = @HAWK_SIZEOF_DOUBLE@ -HAWK_SIZEOF_FLOAT = @HAWK_SIZEOF_FLOAT@ -HAWK_SIZEOF_INT = @HAWK_SIZEOF_INT@ -HAWK_SIZEOF_LONG = @HAWK_SIZEOF_LONG@ -HAWK_SIZEOF_LONG_DOUBLE = @HAWK_SIZEOF_LONG_DOUBLE@ -HAWK_SIZEOF_LONG_LONG = @HAWK_SIZEOF_LONG_LONG@ -HAWK_SIZEOF_OFF64_T = @HAWK_SIZEOF_OFF64_T@ -HAWK_SIZEOF_OFF_T = @HAWK_SIZEOF_OFF_T@ -HAWK_SIZEOF_SHORT = @HAWK_SIZEOF_SHORT@ -HAWK_SIZEOF_VOID_P = @HAWK_SIZEOF_VOID_P@ -HAWK_SIZEOF_WCHAR_T = @HAWK_SIZEOF_WCHAR_T@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/hawk/lib/hawk-cmn.h b/hawk/lib/hawk-cmn.h index 3645cc70..15e041e3 100644 --- a/hawk/lib/hawk-cmn.h +++ b/hawk/lib/hawk-cmn.h @@ -1332,8 +1332,8 @@ typedef enum hawk_log_mask_t hawk_log_mask_t; #else # define HAWK_UT(txt) (L ## txt) - /* if this assertion fails, you should check the compiler flags determining the sizeof wchar_t */ - HAWK_STATIC_ASSERT (sizeof(HAWK_UT('X')) == HAWK_SIZEOF_UCH_T); + /* if this assertion fails, you should check the compiler flags determining the size of wchar_t */ + HAWK_STATIC_ASSERT (sizeof(L'X') == HAWK_SIZEOF_UCH_T); #endif diff --git a/hawk/mod/Makefile.in b/hawk/mod/Makefile.in index e1e839e1..f93d534b 100644 --- a/hawk/mod/Makefile.in +++ b/hawk/mod/Makefile.in @@ -277,18 +277,6 @@ HAVE_CXX = @HAVE_CXX@ HAVE_CXX11 = @HAVE_CXX11@ HAWK_PROJECT_AUTHOR = @HAWK_PROJECT_AUTHOR@ HAWK_PROJECT_URL = @HAWK_PROJECT_URL@ -HAWK_SIZEOF_CHAR = @HAWK_SIZEOF_CHAR@ -HAWK_SIZEOF_DOUBLE = @HAWK_SIZEOF_DOUBLE@ -HAWK_SIZEOF_FLOAT = @HAWK_SIZEOF_FLOAT@ -HAWK_SIZEOF_INT = @HAWK_SIZEOF_INT@ -HAWK_SIZEOF_LONG = @HAWK_SIZEOF_LONG@ -HAWK_SIZEOF_LONG_DOUBLE = @HAWK_SIZEOF_LONG_DOUBLE@ -HAWK_SIZEOF_LONG_LONG = @HAWK_SIZEOF_LONG_LONG@ -HAWK_SIZEOF_OFF64_T = @HAWK_SIZEOF_OFF64_T@ -HAWK_SIZEOF_OFF_T = @HAWK_SIZEOF_OFF_T@ -HAWK_SIZEOF_SHORT = @HAWK_SIZEOF_SHORT@ -HAWK_SIZEOF_VOID_P = @HAWK_SIZEOF_VOID_P@ -HAWK_SIZEOF_WCHAR_T = @HAWK_SIZEOF_WCHAR_T@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/hawk/samples/Makefile.in b/hawk/samples/Makefile.in index c4b3f5be..b7bed9c0 100644 --- a/hawk/samples/Makefile.in +++ b/hawk/samples/Makefile.in @@ -249,18 +249,6 @@ HAVE_CXX = @HAVE_CXX@ HAVE_CXX11 = @HAVE_CXX11@ HAWK_PROJECT_AUTHOR = @HAWK_PROJECT_AUTHOR@ HAWK_PROJECT_URL = @HAWK_PROJECT_URL@ -HAWK_SIZEOF_CHAR = @HAWK_SIZEOF_CHAR@ -HAWK_SIZEOF_DOUBLE = @HAWK_SIZEOF_DOUBLE@ -HAWK_SIZEOF_FLOAT = @HAWK_SIZEOF_FLOAT@ -HAWK_SIZEOF_INT = @HAWK_SIZEOF_INT@ -HAWK_SIZEOF_LONG = @HAWK_SIZEOF_LONG@ -HAWK_SIZEOF_LONG_DOUBLE = @HAWK_SIZEOF_LONG_DOUBLE@ -HAWK_SIZEOF_LONG_LONG = @HAWK_SIZEOF_LONG_LONG@ -HAWK_SIZEOF_OFF64_T = @HAWK_SIZEOF_OFF64_T@ -HAWK_SIZEOF_OFF_T = @HAWK_SIZEOF_OFF_T@ -HAWK_SIZEOF_SHORT = @HAWK_SIZEOF_SHORT@ -HAWK_SIZEOF_VOID_P = @HAWK_SIZEOF_VOID_P@ -HAWK_SIZEOF_WCHAR_T = @HAWK_SIZEOF_WCHAR_T@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/hawk/t/Makefile.in b/hawk/t/Makefile.in index 725c2b05..26297b36 100644 --- a/hawk/t/Makefile.in +++ b/hawk/t/Makefile.in @@ -433,18 +433,6 @@ HAVE_CXX = @HAVE_CXX@ HAVE_CXX11 = @HAVE_CXX11@ HAWK_PROJECT_AUTHOR = @HAWK_PROJECT_AUTHOR@ HAWK_PROJECT_URL = @HAWK_PROJECT_URL@ -HAWK_SIZEOF_CHAR = @HAWK_SIZEOF_CHAR@ -HAWK_SIZEOF_DOUBLE = @HAWK_SIZEOF_DOUBLE@ -HAWK_SIZEOF_FLOAT = @HAWK_SIZEOF_FLOAT@ -HAWK_SIZEOF_INT = @HAWK_SIZEOF_INT@ -HAWK_SIZEOF_LONG = @HAWK_SIZEOF_LONG@ -HAWK_SIZEOF_LONG_DOUBLE = @HAWK_SIZEOF_LONG_DOUBLE@ -HAWK_SIZEOF_LONG_LONG = @HAWK_SIZEOF_LONG_LONG@ -HAWK_SIZEOF_OFF64_T = @HAWK_SIZEOF_OFF64_T@ -HAWK_SIZEOF_OFF_T = @HAWK_SIZEOF_OFF_T@ -HAWK_SIZEOF_SHORT = @HAWK_SIZEOF_SHORT@ -HAWK_SIZEOF_VOID_P = @HAWK_SIZEOF_VOID_P@ -HAWK_SIZEOF_WCHAR_T = @HAWK_SIZEOF_WCHAR_T@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/hawk/tools/Makefile.in b/hawk/tools/Makefile.in index d48a7530..c3599c72 100644 --- a/hawk/tools/Makefile.in +++ b/hawk/tools/Makefile.in @@ -227,18 +227,6 @@ HAVE_CXX = @HAVE_CXX@ HAVE_CXX11 = @HAVE_CXX11@ HAWK_PROJECT_AUTHOR = @HAWK_PROJECT_AUTHOR@ HAWK_PROJECT_URL = @HAWK_PROJECT_URL@ -HAWK_SIZEOF_CHAR = @HAWK_SIZEOF_CHAR@ -HAWK_SIZEOF_DOUBLE = @HAWK_SIZEOF_DOUBLE@ -HAWK_SIZEOF_FLOAT = @HAWK_SIZEOF_FLOAT@ -HAWK_SIZEOF_INT = @HAWK_SIZEOF_INT@ -HAWK_SIZEOF_LONG = @HAWK_SIZEOF_LONG@ -HAWK_SIZEOF_LONG_DOUBLE = @HAWK_SIZEOF_LONG_DOUBLE@ -HAWK_SIZEOF_LONG_LONG = @HAWK_SIZEOF_LONG_LONG@ -HAWK_SIZEOF_OFF64_T = @HAWK_SIZEOF_OFF64_T@ -HAWK_SIZEOF_OFF_T = @HAWK_SIZEOF_OFF_T@ -HAWK_SIZEOF_SHORT = @HAWK_SIZEOF_SHORT@ -HAWK_SIZEOF_VOID_P = @HAWK_SIZEOF_VOID_P@ -HAWK_SIZEOF_WCHAR_T = @HAWK_SIZEOF_WCHAR_T@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@