From d5efa3244672fdf3e0381233726dd4294cfe29c6 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 13 Mar 2013 15:51:44 +0000 Subject: [PATCH] changed configure.ac not to add pthread options to cflags by default --- qse/configure | 20 ++++++++++---------- qse/configure.ac | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qse/configure b/qse/configure index 81400bd4..54a41247 100755 --- a/qse/configure +++ b/qse/configure @@ -1495,7 +1495,7 @@ Optional Features: --enable-debug build the library in the debug mode (default. no) --enable-cxx build the library for C++ if a C++ compiler is available (default. yes) - --enable-reentrant define _REENTRANT (default. yes) + --enable-reentrant add thread options (default. no) --enable-sedtracer enable qse_sed_setexectracer() (default. yes) Optional Packages: @@ -20408,15 +20408,6 @@ else fi -# Check whether --enable-reentrant was given. -if test "${enable_reentrant+set}" = set; then : - enableval=$enable_reentrant; enable_reentrant_is=$enableval -else - enable_reentrant_is=yes -fi - -if test "$enable_reentrant_is" = "yes" -then ac_ext=c @@ -20813,6 +20804,15 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Check whether --enable-reentrant was given. +if test "${enable_reentrant+set}" = set; then : + enableval=$enable_reentrant; enable_reentrant_is=$enableval +else + enable_reentrant_is=no +fi + +if test "$enable_reentrant_is" = "yes" +then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" fi diff --git a/qse/configure.ac b/qse/configure.ac index b6713ce0..069e48d4 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -485,11 +485,11 @@ 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" ) -AC_ARG_ENABLE([reentrant], [AS_HELP_STRING([--enable-reentrant],[define _REENTRANT (default. yes)])], - enable_reentrant_is=$enableval,enable_reentrant_is=yes) +AX_PTHREAD() +AC_ARG_ENABLE([reentrant], [AS_HELP_STRING([--enable-reentrant],[add thread options (default. no)])], + enable_reentrant_is=$enableval,enable_reentrant_is=no) if test "$enable_reentrant_is" = "yes" then - AX_PTHREAD() [CFLAGS="$CFLAGS $PTHREAD_CFLAGS"] [CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"] fi