fixed tests in configure.ac
This commit is contained in:
		
							
								
								
									
										24
									
								
								hcl/configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										24
									
								
								hcl/configure
									
									
									
									
										vendored
									
									
								
							| @ -21063,18 +21063,18 @@ else | |||||||
|  |  | ||||||
| fi | fi | ||||||
|  |  | ||||||
| if test "${enable_shared}" = "no" | if test "x${enable_shared}" = "xno" | ||||||
| then | then | ||||||
| 	enable_dynamic_module_is="no" | 	enable_dynamic_module_is="no" | ||||||
| fi | fi | ||||||
|  |  | ||||||
| if test "${enable_dynamic_module_is}" = "yes" | if test "x${enable_dynamic_module_is}" = "xyes" | ||||||
| then | then | ||||||
|  |  | ||||||
| $as_echo "#define HCL_ENABLE_DYNAMIC_MODULE 1" >>confdefs.h | $as_echo "#define HCL_ENABLE_DYNAMIC_MODULE 1" >>confdefs.h | ||||||
|  |  | ||||||
| fi | fi | ||||||
|  if test "${enable_dynamic_module_is}" = "yes"; then |  if test "x${enable_dynamic_module_is}" = "xyes"; then | ||||||
|   ENABLE_DYNAMIC_MODULE_TRUE= |   ENABLE_DYNAMIC_MODULE_TRUE= | ||||||
|   ENABLE_DYNAMIC_MODULE_FALSE='#' |   ENABLE_DYNAMIC_MODULE_FALSE='#' | ||||||
| else | else | ||||||
| @ -21092,18 +21092,18 @@ else | |||||||
| fi | fi | ||||||
|  |  | ||||||
|  |  | ||||||
| if test "${enable_shared}" = "no" -a "${enable_static}" = "yes" | if test "x${enable_shared}" = "xno" -a "x${enable_static}" = "xyes" | ||||||
| then | then | ||||||
| 	enable_static_module_is="yes" | 	enable_static_module_is="xyes" | ||||||
| fi | fi | ||||||
|  |  | ||||||
| if test "${enable_static_module_is}" = "yes" | if test "x${enable_static_module_is}" = "xyes" | ||||||
| then | then | ||||||
|  |  | ||||||
| $as_echo "#define HCL_ENABLE_STATIC_MODULE 1" >>confdefs.h | $as_echo "#define HCL_ENABLE_STATIC_MODULE 1" >>confdefs.h | ||||||
|  |  | ||||||
| fi | fi | ||||||
|  if test "${enable_static_module_is}" = "yes"; then |  if test "x${enable_static_module_is}" = "xyes"; then | ||||||
|   ENABLE_STATIC_MODULE_TRUE= |   ENABLE_STATIC_MODULE_TRUE= | ||||||
|   ENABLE_STATIC_MODULE_FALSE='#' |   ENABLE_STATIC_MODULE_FALSE='#' | ||||||
| else | else | ||||||
| @ -21120,9 +21120,9 @@ else | |||||||
|  |  | ||||||
| fi | fi | ||||||
|  |  | ||||||
| if test "${enable_libltdl_is}" = "yes" | if test "x${enable_libltdl_is}" = "xyes" | ||||||
| then | then | ||||||
| 	if test "${ac_cv_header_ltdl_h}" = "yes"  -a "${LTDL_LIBS}" != "" | 	if test "x${ac_cv_header_ltdl_h}" = "xyes"  -a "${LTDL_LIBS}" != "" | ||||||
| 	then | 	then | ||||||
|  |  | ||||||
| $as_echo "#define HCL_ENABLE_LIBLTDL /**/" >>confdefs.h | $as_echo "#define HCL_ENABLE_LIBLTDL /**/" >>confdefs.h | ||||||
| @ -21131,7 +21131,7 @@ $as_echo "#define HCL_ENABLE_LIBLTDL /**/" >>confdefs.h | |||||||
| 		enable_libltdl_is="no" | 		enable_libltdl_is="no" | ||||||
| 	fi | 	fi | ||||||
| fi | fi | ||||||
|  if test "${enable_libltdl_is}" = "yes"; then |  if test "x${enable_libltdl_is}" = "xyes"; then | ||||||
|   ENABLE_LIBLTDL_TRUE= |   ENABLE_LIBLTDL_TRUE= | ||||||
|   ENABLE_LIBLTDL_FALSE='#' |   ENABLE_LIBLTDL_FALSE='#' | ||||||
| else | else | ||||||
| @ -21148,7 +21148,7 @@ else | |||||||
|  |  | ||||||
| fi | fi | ||||||
|  |  | ||||||
|  if test "${enable_hcls_is}" = "yes"; then |  if test "x${enable_hcls_is}" = "xyes"; then | ||||||
|   ENABLE_HCLS_TRUE= |   ENABLE_HCLS_TRUE= | ||||||
|   ENABLE_HCLS_FALSE='#' |   ENABLE_HCLS_FALSE='#' | ||||||
| else | else | ||||||
| @ -21165,7 +21165,7 @@ else | |||||||
|  |  | ||||||
| fi | fi | ||||||
|  |  | ||||||
|  if test "${enable_hclc_is}" = "yes"; then |  if test "x${enable_hclc_is}" = "xyes"; then | ||||||
|   ENABLE_HCLC_TRUE= |   ENABLE_HCLC_TRUE= | ||||||
|   ENABLE_HCLC_FALSE='#' |   ENABLE_HCLC_FALSE='#' | ||||||
| else | else | ||||||
|  | |||||||
| @ -597,16 +597,16 @@ AC_ARG_ENABLE([dynamic-module], | |||||||
| 	enable_dynamic_module_is=$enableval, | 	enable_dynamic_module_is=$enableval, | ||||||
| 	enable_dynamic_module_is=yes | 	enable_dynamic_module_is=yes | ||||||
| ) | ) | ||||||
| if test "${enable_shared}" = "no" | if test "x${enable_shared}" = "xno" | ||||||
| then | then | ||||||
| 	enable_dynamic_module_is="no" | 	enable_dynamic_module_is="no" | ||||||
| fi | fi | ||||||
|  |  | ||||||
| if test "${enable_dynamic_module_is}" = "yes" | if test "x${enable_dynamic_module_is}" = "xyes" | ||||||
| then | then | ||||||
| 	AC_DEFINE([HCL_ENABLE_DYNAMIC_MODULE],[1],[enable dynamic module capability]) | 	AC_DEFINE([HCL_ENABLE_DYNAMIC_MODULE],[1],[enable dynamic module capability]) | ||||||
| fi | fi | ||||||
| AM_CONDITIONAL(ENABLE_DYNAMIC_MODULE, test "${enable_dynamic_module_is}" = "yes") | AM_CONDITIONAL(ENABLE_DYNAMIC_MODULE, test "x${enable_dynamic_module_is}" = "xyes") | ||||||
|  |  | ||||||
| dnl ===== enable-static-module ===== | dnl ===== enable-static-module ===== | ||||||
| AC_ARG_ENABLE([static-module], | AC_ARG_ENABLE([static-module], | ||||||
| @ -615,16 +615,16 @@ AC_ARG_ENABLE([static-module], | |||||||
| 	enable_static_module_is=no | 	enable_static_module_is=no | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if test "${enable_shared}" = "no" -a "${enable_static}" = "yes" | if test "x${enable_shared}" = "xno" -a "x${enable_static}" = "xyes" | ||||||
| then | then | ||||||
| 	enable_static_module_is="yes" | 	enable_static_module_is="xyes" | ||||||
| fi | fi | ||||||
|  |  | ||||||
| if test "${enable_static_module_is}" = "yes" | if test "x${enable_static_module_is}" = "xyes" | ||||||
| then | then | ||||||
| 	AC_DEFINE([HCL_ENABLE_STATIC_MODULE],[1],[link modules statically into the main library]) | 	AC_DEFINE([HCL_ENABLE_STATIC_MODULE],[1],[link modules statically into the main library]) | ||||||
| fi | fi | ||||||
| AM_CONDITIONAL(ENABLE_STATIC_MODULE, test "${enable_static_module_is}" = "yes") | AM_CONDITIONAL(ENABLE_STATIC_MODULE, test "x${enable_static_module_is}" = "xyes") | ||||||
|  |  | ||||||
| dnl ===== enable-libltdl ===== | dnl ===== enable-libltdl ===== | ||||||
| AC_ARG_ENABLE([libltdl], | AC_ARG_ENABLE([libltdl], | ||||||
| @ -632,16 +632,16 @@ AC_ARG_ENABLE([libltdl], | |||||||
| 	enable_libltdl_is=$enableval, | 	enable_libltdl_is=$enableval, | ||||||
| 	enable_libltdl_is=no | 	enable_libltdl_is=no | ||||||
| ) | ) | ||||||
| if test "${enable_libltdl_is}" = "yes" | if test "x${enable_libltdl_is}" = "xyes" | ||||||
| then | then | ||||||
| 	if test "${ac_cv_header_ltdl_h}" = "yes"  -a "${LTDL_LIBS}" != "" | 	if test "x${ac_cv_header_ltdl_h}" = "xyes"  -a "${LTDL_LIBS}" != "" | ||||||
| 	then | 	then | ||||||
| 		AC_DEFINE([HCL_ENABLE_LIBLTDL],[],[use libltdl when loading a dynamic module]) | 		AC_DEFINE([HCL_ENABLE_LIBLTDL],[],[use libltdl when loading a dynamic module]) | ||||||
| 	else | 	else | ||||||
| 		enable_libltdl_is="no" | 		enable_libltdl_is="no" | ||||||
| 	fi | 	fi | ||||||
| fi | fi | ||||||
| AM_CONDITIONAL(ENABLE_LIBLTDL, test "${enable_libltdl_is}" = "yes") | AM_CONDITIONAL(ENABLE_LIBLTDL, test "x${enable_libltdl_is}" = "xyes") | ||||||
|  |  | ||||||
| dnl ===== enable-hcls ===== | dnl ===== enable-hcls ===== | ||||||
| AC_ARG_ENABLE([hcls], | AC_ARG_ENABLE([hcls], | ||||||
| @ -649,7 +649,7 @@ AC_ARG_ENABLE([hcls], | |||||||
| 	enable_hcls_is=$enableval, | 	enable_hcls_is=$enableval, | ||||||
| 	enable_hcls_is=no | 	enable_hcls_is=no | ||||||
| ) | ) | ||||||
| AM_CONDITIONAL(ENABLE_HCLS, test "${enable_hcls_is}" = "yes") | AM_CONDITIONAL(ENABLE_HCLS, test "x${enable_hcls_is}" = "xyes") | ||||||
|  |  | ||||||
| dnl ===== enable-hclc ===== | dnl ===== enable-hclc ===== | ||||||
| AC_ARG_ENABLE([hclc], | AC_ARG_ENABLE([hclc], | ||||||
| @ -657,7 +657,7 @@ AC_ARG_ENABLE([hclc], | |||||||
| 	enable_hclc_is=$enableval, | 	enable_hclc_is=$enableval, | ||||||
| 	enable_hclc_is=no | 	enable_hclc_is=no | ||||||
| ) | ) | ||||||
| AM_CONDITIONAL(ENABLE_HCLC, test "${enable_hclc_is}" = "yes") | AM_CONDITIONAL(ENABLE_HCLC, test "x${enable_hclc_is}" = "xyes") | ||||||
|  |  | ||||||
| AC_SUBST(HCL_SIZEOF_WCHAR_T, $ac_cv_sizeof_wchar_t) | AC_SUBST(HCL_SIZEOF_WCHAR_T, $ac_cv_sizeof_wchar_t) | ||||||
| AC_SUBST(HCL_SIZEOF_CHAR16_T, $ac_cv_sizeof_char16_t) | AC_SUBST(HCL_SIZEOF_CHAR16_T, $ac_cv_sizeof_char16_t) | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user