Fixed OS/2 compilation problems.

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index d046f70d483cf1d4bd74e9eccba233dd70fe587d..86218ba3ab0540274706e3962daf10a59b4927dd 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -100,14 +100,19 @@ while test $# -gt 0; do
       fi
 
       if test $static_flag = yes ; then
       fi
 
       if test $static_flag = yes ; then

-          echo "$libs @LDFLAGS@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@"
+          echo "$libs @LDFLAGS@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"

       else
           echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
       fi
 
       ;;
     --gl-libs)
       else
           echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
       fi
 
       ;;
     --gl-libs)

-      echo @WXCONFIG_LIBS_GL@
+      if test $static_flag = yes -a "x" != "x@WXCONFIG_LIBS_STATIC_GL@" ; then
+          gllibs="@libdir@/@WXCONFIG_LIBS_STATIC_GL@"
+      else
+          gllibs="@WXCONFIG_LIBS_GL@"
+      fi
+      echo @LDFLAGS_GL@ "$gllibs"

       ;;
     --cc)
       echo $CC
       ;;
     --cc)
       echo $CC