X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3338009913cb5b586fc81328a1537042bc646f87..0b659b0a51c13cdc4ed21f3f8c020c5055c6c024:/wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 13323f3aae..18fd77a62e 100755
--- a/wx-config.in
+++ b/wx-config.in
@@ -18,10 +18,15 @@ static_flag="@STATIC_FLAG@"
 
 # Misc configuration variables:
 
+update_prefixes()
+{
+    includedir="@includedir@"
+    libdir="@libdir@"
+}
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
-includedir="@includedir@"
-libdir="@libdir@"
+update_prefixes
+
 CC="@CC@"
 GCC="@GCC@"
 CXX="@CXX@"
@@ -52,12 +57,13 @@ LIBS="@LIBS@"
 
 # Linker flags for sublibraries:
 
-CORE_BASE_LIBS="xml net base"
-CORE_GUI_LIBS="html core"
+CORE_BASE_LIBS="@CORE_BASE_LIBS@"
+CORE_GUI_LIBS="@CORE_GUI_LIBS@"
 
 ldlibs_base="@WXCONFIG_EXTRALIBS@"
 ldlibs_core="@EXTRALIBS_GUI@"
 ldlibs_xml="@EXTRALIBS_XML@"
+ldlibs_odbc="@EXTRALIBS_ODBC@"
 
 ldflags_gl="@LDFLAGS_GL@"
 ldlibs_gl="@OPENGL_LIBS@"
@@ -226,12 +232,14 @@ while test $# -gt 0; do
       prefix=`makeabs $srcdir`
       exec_prefix=`makeabs $builddir`
       exec_prefix_set=yes
+      update_prefixes
       ;;
     --prefix=*)
       prefix=$optarg
       if test $exec_prefix_set = no ; then
         exec_prefix=$optarg
       fi
+      update_prefixes
       ;;
     --prefix)
       echo $prefix
@@ -239,6 +247,7 @@ while test $# -gt 0; do
     --exec-prefix=*)
       exec_prefix=$optarg
       exec_prefix_set=yes
+      update_prefixes
       ;;
     --exec-prefix)
       echo $exec_prefix
@@ -250,7 +259,7 @@ while test $# -gt 0; do
       echo $release
       ;;
     --basename)
-      echo $basename
+      echo $basename_gui
       ;;
     --static)
       static_flag=yes
@@ -304,7 +313,7 @@ while test $# -gt 0; do
               fi
           done
           libs_list="$newlist"
-          
+
           # output link flags:
           contrib_libs=`output_libs $libs_list`
           if test $static_flag = yes ; then