From e833fdff6fdba54ba5040bba2f85f2b9372de701 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Sun, 14 Aug 2011 01:05:45 +0000
Subject: [PATCH] enhanced build files

---
 qse/Makefile.in             |  2 +-
 qse/configure               | 97 +++++++++++++++++++++++++++++++++++--
 qse/configure.ac            | 19 ++++++--
 qse/samples/net/Makefile.am |  3 +-
 qse/samples/net/Makefile.in |  6 +--
 qse/samples/sed/Makefile.am |  2 +-
 qse/samples/sed/Makefile.in |  9 ++--
 7 files changed, 116 insertions(+), 22 deletions(-)

diff --git a/qse/Makefile.in b/qse/Makefile.in
index f5f84af3..44c84afc 100644
--- a/qse/Makefile.in
+++ b/qse/Makefile.in
@@ -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
diff --git a/qse/configure b/qse/configure
index 311eecc6..a93ff05c 100755
--- a/qse/configure
+++ b/qse/configure
@@ -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 "-------------------------------------------------------------------------"
 
diff --git a/qse/configure.ac b/qse/configure.ac
index cbb81e29..d2db92e2 100644
--- a/qse/configure.ac
+++ b/qse/configure.ac
@@ -203,17 +203,24 @@ 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"]
+	AX_PTHREAD()
+	[CFLAGS="$CFLAGS $PTHREAD_CFLAGS"]
+	[CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"]
 fi
 
-AX_PTHREAD()
-
 AC_MSG_CHECKING([for socklen_t in sys/socket.h])
 AC_TRY_COMPILE([#define _POSIX_PII_SOCKET
 #include <sys/types.h>
@@ -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 "-------------------------------------------------------------------------"
 ]
diff --git a/qse/samples/net/Makefile.am b/qse/samples/net/Makefile.am
index c243f610..c7f0e400 100644
--- a/qse/samples/net/Makefile.am
+++ b/qse/samples/net/Makefile.am
@@ -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
 
diff --git a/qse/samples/net/Makefile.in b/qse/samples/net/Makefile.in
index 0e8035cb..b696ded9 100644
--- a/qse/samples/net/Makefile.in
+++ b/qse/samples/net/Makefile.in
@@ -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
 
diff --git a/qse/samples/sed/Makefile.am b/qse/samples/sed/Makefile.am
index f1797ae0..9d9e5621 100644
--- a/qse/samples/sed/Makefile.am
+++ b/qse/samples/sed/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 
 
 LDFLAGS = -L../../lib/cmn -L../../lib/sed
-LDADD = -lqsesed -lqsecmn $(LIBM)
+LDADD = -lqsesed -lqsecmn 
 
 bin_PROGRAMS = sed01
 
diff --git a/qse/samples/sed/Makefile.in b/qse/samples/sed/Makefile.in
index 11f20783..a286c80d 100644
--- a/qse/samples/sed/Makefile.in
+++ b/qse/samples/sed/Makefile.in
@@ -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