Commit 31b260c3 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug11835/my41-bug11835 

into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835


configure.in:
  Auto merged
parents 85e54a08 81858c0e

configure.in

+28 −14
Original line number Diff line number Diff line
@@ -1544,6 +1544,16 @@ else 
fi

#---END:



# dlopen, dlerror

case $with_mysqld_ldflags in



  *-all-static*)

    # No need to check for dlopen when mysqld is linked with

    # -all-static as it won't be able to load any functions.



    ;;



  *)

    # Check for dlopen, needed for user definable functions

    # This must be checked after threads on AIX

    # We only need this for mysqld, not for the clients.
@@ -1555,6 +1565,15 @@ LIBDL=$LIBS 
    LIBS="$my_save_LIBS"

    AC_SUBST(LIBDL)



    my_save_LIBS="$LIBS"

    LIBS="$LIBS $LIBDL"

    AC_CHECK_FUNCS(dlopen dlerror)

    LIBS="$my_save_LIBS"



    ;;

esac





# System characteristics

case $SYSTEM_TYPE in

  *netware*) ;;
@@ -1922,11 +1941,6 @@ then 
fi]

)



my_save_LIBS="$LIBS"

LIBS="$LIBS $LIBDL"

AC_CHECK_FUNCS(dlopen dlerror)

LIBS="$my_save_LIBS"



# Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)

ac_save_CXXFLAGS="$CXXFLAGS"

AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,