mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Check for MacOS X native dynamic loading first before lookinf for libdl.

merge-requests/1/head
Henning Geinitz 2003-02-11 17:30:21 +00:00
rodzic 3f2c8ff31e
commit 4c428e0517
4 zmienionych plików z 626 dodań i 617 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2003-02-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
* aclocal.m4 acinclude.m4 configure configure.in: Check for MacOS X
native dynamic loading first before lookinf for libdl.
2003-02-09 Henning Meier-Geinitz <henning@meier-geinitz.de> 2003-02-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
* frontend/saned.c sanei/sanei_codec_bin.c sanei/sanei_wire.c: Check * frontend/saned.c sanei/sanei_codec_bin.c sanei/sanei_wire.c: Check

37
acinclude.m4
Wyświetl plik

@ -119,28 +119,29 @@ AC_DEFUN([SANE_CHECK_DLL_LIB],
[ [
dnl Checks for dll libraries: dl dnl Checks for dll libraries: dl
if test "${enable_dynamic}" != "no"; then if test "${enable_dynamic}" != "no"; then
AC_CHECK_HEADERS(dlfcn.h,
[AC_CHECK_LIB(dl,dlopen, DL_LIB=-ldl)
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${DL_LIB}"
AC_CHECK_FUNCS(dlopen, enable_dynamic=yes,)
LIBS="${saved_LIBS}"
],)
# HP/UX DLL handling
AC_CHECK_HEADERS(dl.h,
[AC_CHECK_LIB(dld,shl_load, DL_LIB=-ldld)
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${DL_LIB}"
AC_CHECK_FUNCS(shl_load, enable_dynamic=yes,)
LIBS="${saved_LIBS}"
],)
#Mac OS X/Darwin #Mac OS X/Darwin
AC_CHECK_HEADERS(mach-o/dyld.h, AC_CHECK_HEADERS(mach-o/dyld.h,
[AC_CHECK_FUNCS(NSLinkModule, enable_dynamic=yes,) [AC_CHECK_FUNCS(NSLinkModule, enable_dynamic=yes,)
DL_LIB="" DL_LIB=""
],) ],
[
# dlopen
AC_CHECK_HEADERS(dlfcn.h,
[AC_CHECK_LIB(dl,dlopen, DL_LIB=-ldl)
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${DL_LIB}"
AC_CHECK_FUNCS(dlopen, enable_dynamic=yes,)
LIBS="${saved_LIBS}"
],)
# HP/UX DLL handling
AC_CHECK_HEADERS(dl.h,
[AC_CHECK_LIB(dld,shl_load, DL_LIB=-ldld)
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${DL_LIB}"
AC_CHECK_FUNCS(shl_load, enable_dynamic=yes,)
LIBS="${saved_LIBS}"
],)
])
fi fi
AC_SUBST(DL_LIB) AC_SUBST(DL_LIB)

37
aclocal.m4 vendored
Wyświetl plik

@ -131,28 +131,29 @@ AC_DEFUN([SANE_CHECK_DLL_LIB],
[ [
dnl Checks for dll libraries: dl dnl Checks for dll libraries: dl
if test "${enable_dynamic}" != "no"; then if test "${enable_dynamic}" != "no"; then
AC_CHECK_HEADERS(dlfcn.h,
[AC_CHECK_LIB(dl,dlopen, DL_LIB=-ldl)
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${DL_LIB}"
AC_CHECK_FUNCS(dlopen, enable_dynamic=yes,)
LIBS="${saved_LIBS}"
],)
# HP/UX DLL handling
AC_CHECK_HEADERS(dl.h,
[AC_CHECK_LIB(dld,shl_load, DL_LIB=-ldld)
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${DL_LIB}"
AC_CHECK_FUNCS(shl_load, enable_dynamic=yes,)
LIBS="${saved_LIBS}"
],)
#Mac OS X/Darwin #Mac OS X/Darwin
AC_CHECK_HEADERS(mach-o/dyld.h, AC_CHECK_HEADERS(mach-o/dyld.h,
[AC_CHECK_FUNCS(NSLinkModule, enable_dynamic=yes,) [AC_CHECK_FUNCS(NSLinkModule, enable_dynamic=yes,)
DL_LIB="" DL_LIB=""
],) ],
[
# dlopen
AC_CHECK_HEADERS(dlfcn.h,
[AC_CHECK_LIB(dl,dlopen, DL_LIB=-ldl)
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${DL_LIB}"
AC_CHECK_FUNCS(dlopen, enable_dynamic=yes,)
LIBS="${saved_LIBS}"
],)
# HP/UX DLL handling
AC_CHECK_HEADERS(dl.h,
[AC_CHECK_LIB(dld,shl_load, DL_LIB=-ldld)
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${DL_LIB}"
AC_CHECK_FUNCS(shl_load, enable_dynamic=yes,)
LIBS="${saved_LIBS}"
],)
])
fi fi
AC_SUBST(DL_LIB) AC_SUBST(DL_LIB)

1164
configure vendored
Wyświetl plik

Plik diff jest za duży Load Diff