hyung-hwan/hio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed checking for an unused library in configure.ac

Browse Source
This commit is contained in:
hyung-hwan 2022-10-07 23:30:25 +09:00
parent 913bb7e0b7
commit ba858ecbc0
7 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -291,7 +291,6 @@ SHELL = @SHELL@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
STRIP = @STRIP@ STRIP = @STRIP@
UNICOWS_LIBS = @UNICOWS_LIBS@
UNWIND_LIBS = @UNWIND_LIBS@ UNWIND_LIBS = @UNWIND_LIBS@
VERSION = @VERSION@ VERSION = @VERSION@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@

4
bin/Makefile.am
View File

@ -11,8 +11,8 @@ LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir)
LIBADD_COMMON = ../lib/libhio.la LIBADD_COMMON = ../lib/libhio.la
if ENABLE_ALL_STATIC if ENABLE_ALL_STATIC
LDFLAGS_ALL_STATIC = -all-static LDFLAGS_ALL_STATIC ?= -all-static
LIBADD_ALL_STATIC = -ldl -lm ## TODO: this may very depending on platforms LIBADD_ALL_STATIC ?=
else else
LDFLAGS_ALL_STATIC = LDFLAGS_ALL_STATIC =
LIBADD_ALL_STATIC = LIBADD_ALL_STATIC =

6
bin/Makefile.in
View File

@ -328,7 +328,6 @@ SHELL = @SHELL@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
STRIP = @STRIP@ STRIP = @STRIP@
UNICOWS_LIBS = @UNICOWS_LIBS@
UNWIND_LIBS = @UNWIND_LIBS@ UNWIND_LIBS = @UNWIND_LIBS@
VERSION = @VERSION@ VERSION = @VERSION@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
@ -397,9 +396,7 @@ CFLAGS_COMMON =
LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir)
LIBADD_COMMON = ../lib/libhio.la LIBADD_COMMON = ../lib/libhio.la
@ENABLE_ALL_STATIC_FALSE@LDFLAGS_ALL_STATIC = @ENABLE_ALL_STATIC_FALSE@LDFLAGS_ALL_STATIC =
@ENABLE_ALL_STATIC_TRUE@LDFLAGS_ALL_STATIC = -all-static
@ENABLE_ALL_STATIC_FALSE@LIBADD_ALL_STATIC = @ENABLE_ALL_STATIC_FALSE@LIBADD_ALL_STATIC =
@ENABLE_ALL_STATIC_TRUE@LIBADD_ALL_STATIC = -ldl -lm ## TODO: this may very depending on platforms
hio_execd_SOURCES = execd.c hio_execd_SOURCES = execd.c
hio_execd_CPPFLAGS = $(CPPFLAGS_COMMON) hio_execd_CPPFLAGS = $(CPPFLAGS_COMMON)
hio_execd_CFLAGS = $(CFLAGS_COMMON) hio_execd_CFLAGS = $(CFLAGS_COMMON)
@ -969,6 +966,9 @@ uninstall-am: uninstall-binPROGRAMS
.PRECIOUS: Makefile .PRECIOUS: Makefile
@ENABLE_ALL_STATIC_TRUE@LDFLAGS_ALL_STATIC ?= -all-static
@ENABLE_ALL_STATIC_TRUE@LIBADD_ALL_STATIC ?=
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

37
configure vendored
View File

@ -659,7 +659,6 @@ ENABLE_SSL_TRUE
SSL_LIBS SSL_LIBS
ENABLE_ALL_STATIC_FALSE ENABLE_ALL_STATIC_FALSE
ENABLE_ALL_STATIC_TRUE ENABLE_ALL_STATIC_TRUE
UNICOWS_LIBS
PTHREAD_CFLAGS PTHREAD_CFLAGS
PTHREAD_LIBS PTHREAD_LIBS
PTHREAD_CC PTHREAD_CC
@ -15474,42 +15473,6 @@ $as_echo "#define HAVE_PTHREAD_MUTEX_TRYLOCK 1" >>confdefs.h
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lunicows" >&5
$as_echo_n "checking for main in -lunicows... " >&6; }
if ${ac_cv_lib_unicows_main+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lunicows $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
return main ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_unicows_main=yes
else
ac_cv_lib_unicows_main=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unicows_main" >&5
$as_echo "$ac_cv_lib_unicows_main" >&6; }
if test "x$ac_cv_lib_unicows_main" = xyes; then :
UNICOWS_LIBS="-lunicows"
fi
# Check whether --enable-all-static was given. # Check whether --enable-all-static was given.
if test "${enable_all_static+set}" = set; then : if test "${enable_all_static+set}" = set; then :
enableval=$enable_all_static; enable_all_static_is=$enableval enableval=$enable_all_static; enable_all_static_is=$enableval

7
configure.ac
View File

@ -241,13 +241,6 @@ AC_CHECK_LIB([pthread], [pthread_mutex_trylock], [
AC_DEFINE([HAVE_PTHREAD_MUTEX_TRYLOCK],1,[pthreads has pthread_mutex_trylock()]) AC_DEFINE([HAVE_PTHREAD_MUTEX_TRYLOCK],1,[pthreads has pthread_mutex_trylock()])
]) ])
dnl check is the import library for unicows.dll exists
dnl this check doesn't look for a particular symbol
dnl but for the symbol 'main' since i want to check
dnl the existence of the libaray.
AC_CHECK_LIB([unicows], [main], [UNICOWS_LIBS="-lunicows"])
AC_SUBST(UNICOWS_LIBS)
dnl ===== enable-all-static ===== dnl ===== enable-all-static =====
AC_ARG_ENABLE([all-static], [AS_HELP_STRING([--enable-all-static],[build the full static binaries(default. no)])], AC_ARG_ENABLE([all-static], [AS_HELP_STRING([--enable-all-static],[build the full static binaries(default. no)])],
enable_all_static_is=$enableval,enable_all_static_is=no) enable_all_static_is=$enableval,enable_all_static_is=no)

1
lib/Makefile.in
View File

@ -368,7 +368,6 @@ SHELL = @SHELL@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
STRIP = @STRIP@ STRIP = @STRIP@
UNICOWS_LIBS = @UNICOWS_LIBS@
UNWIND_LIBS = @UNWIND_LIBS@ UNWIND_LIBS = @UNWIND_LIBS@
VERSION = @VERSION@ VERSION = @VERSION@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@

1
t/Makefile.in
View File

@ -490,7 +490,6 @@ SHELL = @SHELL@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
STRIP = @STRIP@ STRIP = @STRIP@
UNICOWS_LIBS = @UNICOWS_LIBS@
UNWIND_LIBS = @UNWIND_LIBS@ UNWIND_LIBS = @UNWIND_LIBS@
VERSION = @VERSION@ VERSION = @VERSION@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@