don't just drop click events resulting from triple clicks

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 13323f3aae8a2c5d069049ea4b2949449b4bb84e..5416e5f4196e21d19fe9f4cd93499a734698a1e6 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -18,10 +18,15 @@ static_flag="@STATIC_FLAG@"
 
 # Misc configuration variables:
 
 
 # Misc configuration variables:
 

+update_prefixes()
+{
+    includedir="@includedir@"
+    libdir="@libdir@"
+}

 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"

-includedir="@includedir@"
-libdir="@libdir@"
+update_prefixes
+

 CC="@CC@"
 GCC="@GCC@"
 CXX="@CXX@"
 CC="@CC@"
 GCC="@GCC@"
 CXX="@CXX@"


@@ -48,16 +53,20 @@ LDFLAGS_EXE="@LDFLAGS_EXE@"
 MACRESWXCONFIG="@MACRESWXCONFIG@"
 EXTRALIBS_GUI="@EXTRALIBS_GUI@"
 LIBS="@LIBS@"
 MACRESWXCONFIG="@MACRESWXCONFIG@"
 EXTRALIBS_GUI="@EXTRALIBS_GUI@"
 LIBS="@LIBS@"

+WXCONFIG_LDFLAGS_GUI="@WXCONFIG_LDFLAGS_GUI@"

 
 
 # Linker flags for sublibraries:
 
 
 
 # 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_base="@WXCONFIG_EXTRALIBS@"
 ldlibs_core="@EXTRALIBS_GUI@"
 ldlibs_xml="@EXTRALIBS_XML@"

+ldlibs_html="@EXTRALIBS_HTML@"
+ldlibs_odbc="@EXTRALIBS_ODBC@"
+ldlibs_adv="@EXTRALIBS_SDL@"

 
 ldflags_gl="@LDFLAGS_GL@"
 ldlibs_gl="@OPENGL_LIBS@"
 
 ldflags_gl="@LDFLAGS_GL@"
 ldlibs_gl="@OPENGL_LIBS@"


@@ -120,6 +129,19 @@ output_libs()
     echo $all_ldflags $wxlibs $all_libs
 }
 
     echo $all_ldflags $wxlibs $all_libs
 }
 

+# output $(WXCONFIG_LDFLAGS_GUI) if any of libs passed as arguments is GUI
+# library, nothing otherwise:
+get_ldflags_gui()
+{
+    flags_to_ret=""
+    for lib in $* ; do
+        if isinlist $lib $CORE_GUI_LIBS ; then
+            flags_to_ret="$WXCONFIG_LDFLAGS_GUI"
+        fi
+    done
+    echo $flags_to_ret
+}
+

 # return the absolute path prepending builddir to it if needed
 makeabs()
 {
 # return the absolute path prepending builddir to it if needed
 makeabs()
 {


@@ -226,12 +248,14 @@ while test $# -gt 0; do
       prefix=`makeabs $srcdir`
       exec_prefix=`makeabs $builddir`
       exec_prefix_set=yes
       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
       ;;
     --prefix=*)
       prefix=$optarg
       if test $exec_prefix_set = no ; then
         exec_prefix=$optarg
       fi

+      update_prefixes

       ;;
     --prefix)
       echo $prefix
       ;;
     --prefix)
       echo $prefix


@@ -239,6 +263,7 @@ while test $# -gt 0; do
     --exec-prefix=*)
       exec_prefix=$optarg
       exec_prefix_set=yes
     --exec-prefix=*)
       exec_prefix=$optarg
       exec_prefix_set=yes

+      update_prefixes

       ;;
     --exec-prefix)
       echo $exec_prefix
       ;;
     --exec-prefix)
       echo $exec_prefix


@@ -250,7 +275,7 @@ while test $# -gt 0; do
       echo $release
       ;;
     --basename)
       echo $release
       ;;
     --basename)

-      echo $basename
+      echo $basename_gui

       ;;
     --static)
       static_flag=yes
       ;;
     --static)
       static_flag=yes


@@ -268,7 +293,7 @@ while test $# -gt 0; do
       echo ${LDFLAGS_EXE}
       ;;
     --rezflags)
       echo ${LDFLAGS_EXE}
       ;;
     --rezflags)

-      echo ${MACRESWXCONFIG}
+      echo `eval echo ${MACRESWXCONFIG}`

       ;;
 
     --libs*)
       ;;
 
     --libs*)


@@ -304,18 +329,19 @@ while test $# -gt 0; do
               fi
           done
           libs_list="$newlist"
               fi
           done
           libs_list="$newlist"

-          
+

           # output link flags:
           contrib_libs=`output_libs $libs_list`
           if test $static_flag = yes ; then
           # output link flags:
           contrib_libs=`output_libs $libs_list`
           if test $static_flag = yes ; then

-              echo "$libs ${LDFLAGS} ${WXCONFIG_RPATH} $contrib_libs ${libdir}/${WXCONFIG_LIBS_STATIC} ${EXTRALIBS_GUI} ${LIBS} ${DMALLOC_LIBS}"
+              echo "$libs ${LDFLAGS} ${WXCONFIG_LDFLAGS_GUI} ${WXCONFIG_RPATH} $contrib_libs ${libdir}/${WXCONFIG_LIBS_STATIC} ${EXTRALIBS_GUI} ${LIBS} ${DMALLOC_LIBS}"

           else
           else

-              echo $libs ${LDFLAGS} ${WXCONFIG_RPATH} $contrib_libs ${WXCONFIG_LIBS} ${DMALLOC_LIBS}
+              echo $libs ${LDFLAGS} ${WXCONFIG_LDFLAGS_GUI} ${WXCONFIG_RPATH} $contrib_libs ${WXCONFIG_LIBS} ${DMALLOC_LIBS}

           fi
       else
           # in multilib mode, link against all sublibraries:
           wxlibs=`output_libs $libs_list`
           fi
       else
           # in multilib mode, link against all sublibraries:
           wxlibs=`output_libs $libs_list`

-          echo $libs ${LDFLAGS} ${WXCONFIG_RPATH} $wxlibs ${DMALLOC_LIBS}
+          guildflags=`get_ldflags_gui $libs_list`
+          echo $libs ${LDFLAGS} ${guildflags} ${WXCONFIG_RPATH} $wxlibs ${DMALLOC_LIBS}

       fi
 
       ;;
       fi
 
       ;;