SWIGged update for wxGTK

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 1e487ad56148f9d597b981351732273724f7a3ef..74ba23e94d024adb8b6ac7bfeff1b9e83873bd5a 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -8,7 +8,7 @@ GCC="@GCC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
 srcdir=@top_srcdir@
-builddir=@top_builddir@
+builddir=@top_builddir_wxconfig@
 cross_compiling=@cross_compiling@
 target=@host_alias@
 static_flag=@STATIC_FLAG@
@@ -33,8 +33,8 @@ makeabs()
 usage()
 {
     cat <<EOF
-Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static]
-                 [--libs] [--gl-libs]
+Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--release]
+                 [--basename] [--static] [--libs] [--gl-libs]
                  [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]
                  [--cc] [--cxx] [--ld]
 
@@ -131,6 +131,14 @@ while test $# -gt 0; do
     --version)
       echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;
+    --release)
+      # Should echo @WX_RELEASE@ instead, but that doesn't seem to be replaced after 
+      # configure has run on this file.
+      echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@
+      ;;
+    --basename)
+      echo @WX_LIBRARY_BASENAME@
+      ;;
     --static)
       static_flag=yes
       ;;
@@ -147,7 +155,7 @@ while test $# -gt 0; do
       echo @LDFLAGS_EXE@
       ;;
     --rezflags)
-      echo @LIBWXMACRESWXCONFIG@
+      echo @MACRESWXCONFIG@
       ;;
     --libs)
       if test "@libdir@" != "/usr/lib" \
@@ -158,7 +166,7 @@ while test $# -gt 0; do
       fi
 
       if test $static_flag = yes ; then
-          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
+          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @EXTRALIBS_GUI@ @LIBS@ @DMALLOC_LIBS@"
       else
           echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
       fi