From 8511875b54907748e3438f6b979de4a23e7f98d8 Mon Sep 17 00:00:00 2001 From: konn Date: Fri, 9 May 2008 18:14:42 +0000 Subject: [PATCH] * remove -lmemcache. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@2629 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- configure | 63 +++++++++++++++++++++++++++++++++++------------------------- configure.ac | 12 +++++++++--- 2 files changed, 46 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 742f58f1..2c8bb0ca 100755 --- a/configure +++ b/configure @@ -1493,6 +1493,7 @@ Optional Features: --enable-img-conv-f Please specify it when you change the file name of the image being written in the source by the automatic operation. --enable-memcache-cookie Please specify it when you save Cookie in memcached. + --enable-memcached-static use static link. --enable-mysql-cookie Please specify it when you save Cookie in MySQL. --enable-dump-log When the log of conversion is output, it specifies it with the output file. @@ -4458,7 +4459,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4461 "configure"' > conftest.$ac_ext + echo '#line 4462 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7184,11 +7185,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7187: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7188: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7191: \$? = $ac_status" >&5 + echo "$as_me:7192: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7452,11 +7453,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7455: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7456: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7459: \$? = $ac_status" >&5 + echo "$as_me:7460: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7556,11 +7557,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7559: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7560: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7563: \$? = $ac_status" >&5 + echo "$as_me:7564: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9853,7 +9854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12293: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12296: \$? = $ac_status" >&5 + echo "$as_me:12297: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12393,11 +12394,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12396: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12397: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12400: \$? = $ac_status" >&5 + echo "$as_me:12401: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13954,11 +13955,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13957: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13958: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13961: \$? = $ac_status" >&5 + echo "$as_me:13962: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14058,11 +14059,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14062: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14065: \$? = $ac_status" >&5 + echo "$as_me:14066: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16245,11 +16246,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16248: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16249: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16252: \$? = $ac_status" >&5 + echo "$as_me:16253: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16513,11 +16514,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16516: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16517: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16520: \$? = $ac_status" >&5 + echo "$as_me:16521: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16617,11 +16618,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16620: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16621: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16624: \$? = $ac_status" >&5 + echo "$as_me:16625: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19440,6 +19441,11 @@ if test "${enable_memcache_cookie+set}" = set; then enableval=$enable_memcache_cookie; fi +# Check whether --enable-memcached-static was given. +if test "${enable_memcached_static+set}" = set; then + enableval=$enable_memcached_static; +fi + # Check whether --with-memcached-header was given. if test "${with_memcached_header+set}" = set; then @@ -19471,8 +19477,13 @@ Please specify the --with-memcached-lib-dir And, please specify the place of lib " >&2;} { (exit 1); exit 1; }; } fi - MEMCACHE_COOKIE_DEFS="-DUSE_MEMCACHE_COOKIE -I${with_memcached_header} " - MEMCACHE_COOKIE_LIBS="-L${with_memcached_lib_dir} -lmemcached " + if test "x$enable_memcached_static" = "xyes" ; then + MEMCACHE_COOKIE_DEFS="-DUSE_MEMCACHE_COOKIE -I${with_memcached_header} " + MEMCACHE_COOKIE_LIBS=" ${with_memcached_lib_dir}/libmemcached.a " + else + MEMCACHE_COOKIE_DEFS="-DUSE_MEMCACHE_COOKIE -I${with_memcached_header} " + MEMCACHE_COOKIE_LIBS="-L${with_memcached_lib_dir} -lmemcached " + fi else MEMCACHE_COOKIE_DEFS="" MEMCACHE_COOKIE_LIBS="" @@ -19942,7 +19953,7 @@ LIBS="${LIBS} `${WAND_CONFIG} --ldflags` `${WAND_CONFIG} --libs | sed -e s/-ldps LIBS="${LIBS} `${APR_CONFIG} --ldflags` `${APR_CONFIG} --libs` " LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` " LIBS="${LIBS} ${MYSQL_COOKIE_LIBS}" -LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} -lmemcache" +LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} " CFLAGS="${CFLAGS} `${WAND_CONFIG} --cppflags` `${WAND_CONFIG} --cflags`" CFLAGS="${CFLAGS} `${APR_CONFIG} --includes` `${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`" CFLAGS="${CFLAGS} `${APU_CONFIG} --includes`" diff --git a/configure.ac b/configure.ac index d91b23be..a4ee94bc 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,7 @@ dnl SAVE COOKIE to memcached Mode dnl dnl ================================================== AC_ARG_ENABLE(memcache-cookie, [ --enable-memcache-cookie Please specify it when you save Cookie in memcached. ]) +AC_ARG_ENABLE(memcached-static, [ --enable-memcached-static use static link. ]) AC_ARG_WITH(memcached-header, [ --with-memcached-header Path of "memcached.h"]) AC_ARG_WITH(memcached-lib-dir, [ --with-memcached-lib-dir Path of "libmemcached.so"]) if test "x$enable_memcache_cookie" = "xyes" ; then @@ -110,8 +111,13 @@ Please specify the --with-memcached-header And, please specify the place of the Please specify the --with-memcached-lib-dir And, please specify the place of libmemcached library directory. ]) fi - MEMCACHE_COOKIE_DEFS="-DUSE_MEMCACHE_COOKIE -I${with_memcached_header} " - MEMCACHE_COOKIE_LIBS="-L${with_memcached_lib_dir} -lmemcached " + if test "x$enable_memcached_static" = "xyes" ; then + MEMCACHE_COOKIE_DEFS="-DUSE_MEMCACHE_COOKIE -I${with_memcached_header} " + MEMCACHE_COOKIE_LIBS=" ${with_memcached_lib_dir}/libmemcached.a " + else + MEMCACHE_COOKIE_DEFS="-DUSE_MEMCACHE_COOKIE -I${with_memcached_header} " + MEMCACHE_COOKIE_LIBS="-L${with_memcached_lib_dir} -lmemcached " + fi else dnl ====================================== dnl no use MEMCACHE COOKIE @@ -240,7 +246,7 @@ LIBS="${LIBS} `${WAND_CONFIG} --ldflags` `${WAND_CONFIG} --libs | sed -e s/-ldps LIBS="${LIBS} `${APR_CONFIG} --ldflags` `${APR_CONFIG} --libs` " LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` " LIBS="${LIBS} ${MYSQL_COOKIE_LIBS}" -LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} -lmemcache" +LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} " CFLAGS="${CFLAGS} `${WAND_CONFIG} --cppflags` `${WAND_CONFIG} --cflags`" CFLAGS="${CFLAGS} `${APR_CONFIG} --includes` `${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`" CFLAGS="${CFLAGS} `${APU_CONFIG} --includes`" -- 2.11.0