diff options
| author | Haru <haru@dotalux.com> | 2014-10-24 00:40:42 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-10-24 00:51:37 +0200 |
| commit | bf2d0b4295b5197ce6d303e8124c470613df94bf (patch) | |
| tree | 1f289566edf4c2218da14f47dc335496b0ff583b /configure | |
| parent | 32d658cc23e4f935a388876a8525ac0e7159154a (diff) | |
| download | hercules-bf2d0b4295b5197ce6d303e8124c470613df94bf.tar.gz hercules-bf2d0b4295b5197ce6d303e8124c470613df94bf.tar.bz2 hercules-bf2d0b4295b5197ce6d303e8124c470613df94bf.tar.xz hercules-bf2d0b4295b5197ce6d303e8124c470613df94bf.zip | |
Fixed an issue with $LIBS in the configure script
- It is now possible to pass custom LIBS values to ./configure by
specifying them on the command line
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 106 |
1 files changed, 53 insertions, 53 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in 9c48781. +# From configure.in d84fa6f. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -623,7 +623,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS -DLLEXT HAVE_PERL HAVE_DOXYGEN PLUGINSTATIC @@ -636,6 +635,7 @@ MYSQL_CFLAGS MYSQL_VERSION HAVE_MYSQL MYSQL_CONFIG_HOME +DLLEXT WITH_PLUGINS SOFLAGS AR @@ -6622,6 +6622,57 @@ case $enable_renewal in esac # +# Host specific stuff +# +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host OS" >&5 +$as_echo_n "checking host OS... " >&6; } +host_os="`uname`" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $host_os" >&5 +$as_echo "$host_os" >&6; } +fd_setsize="" +DLLEXT=".so" +case $host_os in +Solaris* ) + LIBS="$LIBS -lsocket -lnsl -ldl" + ;; +Linux* ) + LIBS="$LIBS -ldl" + ;; +FreeBSD*) + CPPFLAGS="$CPPFLAGS -D__FREEBSD__" + ;; +NetBSD*) + CPPFLAGS="$CPPFLAGS -D__NETBSD__" + ;; +CYGWIN*) + CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=4096 -DCYGWIN" + fd_setsize="done" + DLLEXT=".dll" + ;; +Darwin*) + DLLEXT=".dylib" + ;; +esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MinGW" >&5 +$as_echo_n "checking for MinGW... " >&6; } +if test -n "`$CC --version 2>/dev/null | grep -i mingw`" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CPPFLAGS="$CPPFLAGS -DMINGW" + if test -z "$fd_setsize" ; then + CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=4096" + fi + LIBS="$LIBS -lws2_32" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +# # zlib library (required) # if test -n "${ZLIB_HOME}" ; then @@ -7723,57 +7774,6 @@ fi -# -# Host specific stuff -# -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host OS" >&5 -$as_echo_n "checking host OS... " >&6; } -host_os="`uname`" -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $host_os" >&5 -$as_echo "$host_os" >&6; } -fd_setsize="" -DLLEXT=".so" -case $host_os in -Solaris* ) - LIBS="$LIBS -lsocket -lnsl -ldl" - ;; -Linux* ) - LIBS="$LIBS -ldl" - ;; -FreeBSD*) - CPPFLAGS="$CPPFLAGS -D__FREEBSD__" - ;; -NetBSD*) - CPPFLAGS="$CPPFLAGS -D__NETBSD__" - ;; -CYGWIN*) - CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=4096 -DCYGWIN" - fd_setsize="done" - DLLEXT=".dll" - ;; -Darwin*) - DLLEXT=".dylib" - ;; -esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MinGW" >&5 -$as_echo_n "checking for MinGW... " >&6; } -if test -n "`$CC --version 2>/dev/null | grep -i mingw`" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CPPFLAGS="$CPPFLAGS -DMINGW" - if test -z "$fd_setsize" ; then - CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=4096" - fi - LIBS="$LIBS -lws2_32" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - ############################################################################### cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure |