Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-ldl only added if it exists

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-04 12:56:01 +00:00
parent 9b94d7f91e
commit d443da9d54
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.in
View File

@@ -1447,7 +1447,7 @@ if test "$wxUSE_GTK" = 1; then
fi fi
TOOLKIT_INCLUDE="$GTK_CFLAGS" TOOLKIT_INCLUDE="$GTK_CFLAGS"
GUI_TK_LIBRARY="$GTK_LIBS -ldl" GUI_TK_LIBRARY="$GTK_LIBS"
TOOLKIT=GTK TOOLKIT=GTK
GUIHEADERS=GTK_HEADERS GUIHEADERS=GTK_HEADERS
@@ -1496,7 +1496,7 @@ if test "$wxUSE_WINE" = 1; then
AC_MSG_ERROR(no) AC_MSG_ERROR(no)
fi fi
GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -ldl -lm" GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -lm"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
WXWINE=1 WXWINE=1
TOOLKIT=MSW TOOLKIT=MSW
@@ -1572,7 +1572,7 @@ if test "$wxUSE_MOTIF" = 1; then
AC_MSG_WARN(library will be compiled without support for images in XPM format) AC_MSG_WARN(library will be compiled without support for images in XPM format)
fi fi
GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm" GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -lm"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
TOOLKIT=MOTIF TOOLKIT=MOTIF
@@ -1587,6 +1587,13 @@ if test "$wxUSE_MOTIF" = 1; then
GUIDIST=MOTIF_DIST GUIDIST=MOTIF_DIST
fi fi
dnl someone explicitly added -ldl to the list of libraries for these targets -
dnl I don't know why has this been done, but let's respect this - with the
dnl exception of the systems which don't have libdl at all (VZ)
if test "$wxUSE_GTK" = 1 || test "$wxUSE_MOTIF" = 1 || test "$wxUSE_WINE" = 1; then
AC_CHECK_LIB(dl, main, GUI_TK_LIBRARY="$GUI_TK_LIBRARY -ldl")
fi
dnl the name of the directory where the files for this toolkit live dnl the name of the directory where the files for this toolkit live
TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"` TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`