enhanced build files
This commit is contained in:
parent
ce8e12cb46
commit
e833fdff6f
@ -34,7 +34,7 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/README.in \
|
||||
$(top_srcdir)/configure ac/config.guess ac/config.sub \
|
||||
ac/depcomp ac/install-sh ac/ltmain.sh ac/missing
|
||||
|
97
qse/configure
vendored
97
qse/configure
vendored
@ -16644,7 +16644,93 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# configure makefiles
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
|
||||
$as_echo_n "checking for socket in -lsocket... " >&6; }
|
||||
if test "${ac_cv_lib_socket_socket+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char socket ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return socket ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_socket_socket=yes
|
||||
else
|
||||
ac_cv_lib_socket_socket=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_socket_socket" >&5
|
||||
$as_echo "$ac_cv_lib_socket_socket" >&6; }
|
||||
if test "x$ac_cv_lib_socket_socket" = x""yes; then :
|
||||
SOCKET_LIBS="-lsocket"
|
||||
else
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
|
||||
$as_echo_n "checking for socket in -lsocket... " >&6; }
|
||||
if test "${ac_cv_lib_socket_socket+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lsocket -lnsl
|
||||
$LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char socket ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return socket ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_socket_socket=yes
|
||||
else
|
||||
ac_cv_lib_socket_socket=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_socket_socket" >&5
|
||||
$as_echo "$ac_cv_lib_socket_socket" >&6; }
|
||||
if test "x$ac_cv_lib_socket_socket" = x""yes; then :
|
||||
SOCKET_LIBS="-lsocket -lnsl"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-reentrant was given.
|
||||
if test "${enable_reentrant+set}" = set; then :
|
||||
enableval=$enable_reentrant; enable_reentrant_is=$enableval
|
||||
@ -16654,10 +16740,6 @@ fi
|
||||
|
||||
if test "$enable_reentrant_is" = "yes"
|
||||
then
|
||||
CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
|
||||
CXXFLAGS="$CXXFLAGS -D_REENTRANT -D_THREAD_SAFE"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
ac_ext=c
|
||||
@ -17046,6 +17128,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t in sys/socket.h" >&5
|
||||
$as_echo_n "checking for socklen_t in sys/socket.h... " >&6; }
|
||||
@ -19766,5 +19851,7 @@ echo " C++ compiler: ${CXX} ${CXXFLAGS}"
|
||||
echo " C++ support: ${enable_cxx_is}"
|
||||
echo " Wide character: ${enable_wchar_is}"
|
||||
echo " Math library: ${LIBM}"
|
||||
echo " Pthread library: ${PTHREAD_LIBS}"
|
||||
echo " Socket library: ${SOCKET_LIBS}"
|
||||
echo "-------------------------------------------------------------------------"
|
||||
|
||||
|
@ -203,16 +203,23 @@ AC_ARG_ENABLE([cxx], [AS_HELP_STRING([--enable-cxx],[build the library for C++ i
|
||||
[test "${HAVE_CXX}" = "yes" || enable_cxx_is="no"]
|
||||
AM_CONDITIONAL(ENABLE_CXX, test "${enable_cxx_is}" = "yes" )
|
||||
|
||||
# configure makefiles
|
||||
|
||||
AC_CHECK_LIB([socket], [socket], [SOCKET_LIBS="-lsocket"],
|
||||
[
|
||||
AC_CHECK_LIB([socket], [socket],
|
||||
[SOCKET_LIBS="-lsocket -lnsl"], [], [-lnsl]
|
||||
)
|
||||
]
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE([reentrant], [AS_HELP_STRING([--enable-reentrant],[define _REENTRANT (default. yes)])],
|
||||
enable_reentrant_is=$enableval,enable_reentrant_is=yes)
|
||||
if test "$enable_reentrant_is" = "yes"
|
||||
then
|
||||
[CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"]
|
||||
[CXXFLAGS="$CXXFLAGS -D_REENTRANT -D_THREAD_SAFE"]
|
||||
fi
|
||||
|
||||
AX_PTHREAD()
|
||||
[CFLAGS="$CFLAGS $PTHREAD_CFLAGS"]
|
||||
[CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"]
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for socklen_t in sys/socket.h])
|
||||
AC_TRY_COMPILE([#define _POSIX_PII_SOCKET
|
||||
@ -287,5 +294,7 @@ echo " C++ compiler: ${CXX} ${CXXFLAGS}"
|
||||
echo " C++ support: ${enable_cxx_is}"
|
||||
echo " Wide character: ${enable_wchar_is}"
|
||||
echo " Math library: ${LIBM}"
|
||||
echo " Pthread library: ${PTHREAD_LIBS}"
|
||||
echo " Socket library: ${SOCKET_LIBS}"
|
||||
echo "-------------------------------------------------------------------------"
|
||||
]
|
||||
|
@ -7,9 +7,8 @@ AM_CPPFLAGS = \
|
||||
|
||||
bin_PROGRAMS = http01
|
||||
|
||||
CFLAGS += $(PTHREAD_CFLAGS)
|
||||
LDFLAGS += -L../../lib/cmn -L../../lib/net
|
||||
LDADD = -lqsenet -lqsecmn $(LIBM) $(PTHREAD_LIBS)
|
||||
LDADD = -lqsenet -lqsecmn $(PTHREAD_LIBS) $(SOCKET_LIBS)
|
||||
|
||||
http01_SOURCES = http01.c
|
||||
|
||||
|
@ -54,7 +54,7 @@ am_http01_OBJECTS = http01.$(OBJEXT)
|
||||
http01_OBJECTS = $(am_http01_OBJECTS)
|
||||
http01_LDADD = $(LDADD)
|
||||
am__DEPENDENCIES_1 =
|
||||
http01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
||||
http01_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
DEFAULT_INCLUDES =
|
||||
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@ -83,7 +83,7 @@ AWK = @AWK@
|
||||
BUILD_MODE = @BUILD_MODE@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@ $(PTHREAD_CFLAGS)
|
||||
CFLAGS = @CFLAGS@
|
||||
CHAR_MODE = @CHAR_MODE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
@ -220,7 +220,7 @@ AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(includedir)
|
||||
|
||||
LDADD = -lqsenet -lqsecmn $(LIBM) $(PTHREAD_LIBS)
|
||||
LDADD = -lqsenet -lqsecmn $(PTHREAD_LIBS) $(SOCKET_LIBS)
|
||||
http01_SOURCES = http01.c
|
||||
all: all-am
|
||||
|
||||
|
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
|
||||
|
||||
|
||||
LDFLAGS = -L../../lib/cmn -L../../lib/sed
|
||||
LDADD = -lqsesed -lqsecmn $(LIBM)
|
||||
LDADD = -lqsesed -lqsecmn
|
||||
|
||||
bin_PROGRAMS = sed01
|
||||
|
||||
|
@ -55,18 +55,17 @@ PROGRAMS = $(bin_PROGRAMS)
|
||||
am_sed01_OBJECTS = sed01.$(OBJEXT)
|
||||
sed01_OBJECTS = $(am_sed01_OBJECTS)
|
||||
am__DEPENDENCIES_1 =
|
||||
am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
|
||||
sed01_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
sed01_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
am__sed02_SOURCES_DIST = sed02.cpp
|
||||
@ENABLE_CXX_TRUE@am_sed02_OBJECTS = sed02.$(OBJEXT)
|
||||
sed02_OBJECTS = $(am_sed02_OBJECTS)
|
||||
@ENABLE_CXX_TRUE@sed02_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
||||
@ENABLE_CXX_TRUE@ $(am__DEPENDENCIES_2)
|
||||
@ENABLE_CXX_TRUE@ $(am__DEPENDENCIES_1)
|
||||
am__sed03_SOURCES_DIST = sed03.cpp
|
||||
@ENABLE_CXX_TRUE@am_sed03_OBJECTS = sed03.$(OBJEXT)
|
||||
sed03_OBJECTS = $(am_sed03_OBJECTS)
|
||||
@ENABLE_CXX_TRUE@sed03_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
||||
@ENABLE_CXX_TRUE@ $(am__DEPENDENCIES_2)
|
||||
@ENABLE_CXX_TRUE@ $(am__DEPENDENCIES_1)
|
||||
DEFAULT_INCLUDES =
|
||||
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@ -242,7 +241,7 @@ AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(includedir)
|
||||
|
||||
LDADD = -lqsesed -lqsecmn $(LIBM)
|
||||
LDADD = -lqsesed -lqsecmn
|
||||
sed01_SOURCES = sed01.c
|
||||
sed01_LDADD = $(LDADD)
|
||||
@ENABLE_CXX_TRUE@CXXLIB = -lqsesedxx -lqsecmnxx
|
||||
|
Loading…
Reference in New Issue
Block a user