add -lXpm to the GUI libs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index af1263ebf9b8d97d4faab102c727cd4afe80c854..7d35bc3ceb2bd0681955ae89fdb47fbfb3bde683 100755 (executable)
--- a/configure
+++ b/configure
@@ -23038,7 +23038,7 @@ echo "$as_me: WARNING: pangoxft library not found, library will be compiled with
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
         else
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
         fi
 
         TOOLKIT_VPATH="\${top_srcdir}/src/x11"
@@ -24215,7 +24215,7 @@ echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6
                 for libsm_ice in "" " -lSM -lICE"; do
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
-                        LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
+                        LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                         save_CFLAGS=$CFLAGS
                         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
@@ -24348,7 +24348,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         CFLAGS=$save_CFLAGS
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
         TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"
         TOOLKIT=MOTIF
         GUIDIST=MOTIF_DIST
@@ -24444,7 +24444,7 @@ echo "$as_me:$LINENO: result: $wx_cv_x11_xpm_h" >&5
 echo "${ECHO_T}$wx_cv_x11_xpm_h" >&6
 
                 if test $wx_cv_x11_xpm_h = "yes"; then
-                    xpm_link=" -lXpm"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm"
                     cat >>confdefs.h <<\_ACEOF
 #define wxHAVE_LIB_XPM 1
 _ACEOF

diff --git a/configure.in b/configure.in
index d33a93373f6c9a0b6da16c29dccd09c32b36b7c0..34a7d2007cd9d9317f783711d7ac45f55c466d07 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2563,7 +2563,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
         else
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
         fi
 
         TOOLKIT_VPATH="\${top_srcdir}/src/x11"
@@ -2659,7 +2659,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                 for libsm_ice in "" " -lSM -lICE"; do
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
-                        LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
+                        LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                         save_CFLAGS=$CFLAGS
                         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
@@ -2716,7 +2716,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                        ])
         CFLAGS=$save_CFLAGS
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
         TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"
         TOOLKIT=MOTIF
         GUIDIST=MOTIF_DIST
@@ -2755,7 +2755,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                 )
 
                 if test $wx_cv_x11_xpm_h = "yes"; then
-                    xpm_link=" -lXpm"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm"
                     AC_DEFINE(wxHAVE_LIB_XPM)
                 else
                     AC_MSG_WARN([built-in less efficient XPM decoder will be used])