Author: metze Date: 2006-09-13 08:14:10 +0000 (Wed, 13 Sep 2006) New Revision: 18445
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18445 Log: splitout the dlfcn related tests metze Added: branches/SAMBA_4_0/source/lib/replace/dlfcn.m4 Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4 Changeset: Added: branches/SAMBA_4_0/source/lib/replace/dlfcn.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/dlfcn.m4 2006-09-13 07:35:42 UTC (rev 18444) +++ branches/SAMBA_4_0/source/lib/replace/dlfcn.m4 2006-09-13 08:14:10 UTC (rev 18445) @@ -0,0 +1,18 @@ +dnl dummies provided by dlfcn.c if not available +save_LIBS="$LIBS" +LIBS="" + +AC_SEARCH_LIBS(dlopen, dl) + +AC_CHECK_HEADERS(dlfcn.h) + +libreplace_dlfcn=no +AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_dlfcn=yes]) + +if test x"${libreplace_dlfcn}" = x"yes";then + LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o" +fi + +LIBDL="$LIBS" +AC_SUBST(LIBDL) +LIBS="$save_LIBS" Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-13 07:35:42 UTC (rev 18444) +++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-13 08:14:10 UTC (rev 18445) @@ -11,7 +11,7 @@ LIBREPLACEOBJ="replace.o" AC_SUBST(LIBREPLACEOBJ) -LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o snprintf.o timegm.o" +LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o timegm.o" dnl stop the C89 attempt by autoconf - if autoconf detects -Ae it will enable it dnl which conflicts with C99 on HPUX @@ -235,19 +235,11 @@ AC_DEFINE(HAVE_C99_VSNPRINTF,1,[Whether there is a C99 compliant vsnprintf]) fi -dnl dummies provided by dlfcn.c if not available -save_LIBS="$LIBS" -LIBS="" -AC_SEARCH_LIBS(dlopen, dl) -AC_CHECK_HEADERS(dlfcn.h) -AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) -LIBDL="$LIBS" -AC_SUBST(LIBDL) -LIBS="$save_LIBS" AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],, [AC_MSG_ERROR([Required function not found])]) +m4_include(dlfcn.m4) m4_include(getpass.m4) m4_include(system/config.m4)