[librewms] 02/04: Imported Upstream version 1.0.0a

Bas Couwenberg sebastic at xs4all.nl
Fri Nov 21 22:45:43 UTC 2014


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository librewms.

commit 690be954a4ebb0bf4e971effa47574026d965b72
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 21 17:41:45 2014 +0100

    Imported Upstream version 1.0.0a
---
 Dialogs.cpp                |  2 +-
 LayerTree.cpp              |  1 -
 Makefile.in                |  2 +-
 README                     |  3 +-
 configure                  | 77 ++++++++++++++++++++++++++++++----------------
 configure.ac               | 32 ++++++++++++++-----
 gnome_resource/Makefile.in |  2 +-
 icons/Makefile.in          |  2 +-
 mac_resource/Makefile.in   |  2 +-
 win_resource/Makefile.in   |  2 +-
 10 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/Dialogs.cpp b/Dialogs.cpp
index d43acae..2931009 100644
--- a/Dialogs.cpp
+++ b/Dialogs.cpp
@@ -3494,7 +3494,7 @@ void UserScaleDialog::CreateControls()
                                               wxALIGN_RIGHT);
   scaleBoxSizer->Add(scaleLabel, 0, wxALIGN_CENTER_VERTICAL | wxALL, 2);
   wxSpinCtrl *scaleCtrl = new wxSpinCtrl(this, ID_USER_SCALE, wxEmptyString,
-                                         wxDefaultPosition, wxSize(120, 20),
+                                         wxDefaultPosition, wxSize(120, 24),
                                          wxSP_ARROW_KEYS,
                                          1, 100000000, CurrentScale);
   scaleBoxSizer->Add(scaleCtrl, 0, wxALIGN_CENTER_VERTICAL | wxALL, 2);
diff --git a/LayerTree.cpp b/LayerTree.cpp
index c05f824..4b9e2c4 100644
--- a/LayerTree.cpp
+++ b/LayerTree.cpp
@@ -555,7 +555,6 @@ MyCatalogTree::MyCatalogTree(WmsDialog * parent, wxSize sz, wxWindowID id):wxTre
   Images->Add(icons[1]);
   Images->Add(icons[2]);
   SetImageList(Images);
-  SetItemImage(Root, 0);
 
 // setting up event handlers 
   Connect(wxID_ANY, wxEVT_COMMAND_TREE_SEL_CHANGED,
diff --git a/Makefile.in b/Makefile.in
index 4740643..ee9bd91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -323,7 +323,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WX_CONFIG = @WX_CONFIG@
+WXCONFIG = @WXCONFIG@
 WX_LIBS = @WX_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/README b/README
index 98ed355..5b2704b 100644
--- a/README
+++ b/README
@@ -1 +1,2 @@
-If you get build (compilation) errors about missing symbols or types starting with wx, then try installing the GTK version of the WxWidgets packages (if any).
\ No newline at end of file
+If you get build (compilation) errors about missing symbols or types starting with wx, then try installing 
+the GTK version of the WxWidgets packages (if any).
diff --git a/configure b/configure
index 1a796a3..e0da508 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for LibreWMS 1.0.0.
+# Generated by GNU Autoconf 2.69 for LibreWMS 1.0.0a.
 #
 # Report bugs to <a.furieri at lqt.it>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='LibreWMS'
 PACKAGE_TARNAME='librewms'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='LibreWMS 1.0.0'
+PACKAGE_VERSION='1.0.0a'
+PACKAGE_STRING='LibreWMS 1.0.0a'
 PACKAGE_BUGREPORT='a.furieri at lqt.it'
 PACKAGE_URL=''
 
@@ -643,7 +643,7 @@ PKG_CONFIG_PATH
 PKG_CONFIG
 LIBOBJS
 WX_LIBS
-WX_CONFIG
+WXCONFIG
 CXXCPP
 OTOOL64
 OTOOL
@@ -780,6 +780,7 @@ enable_fast_install
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_wxconfig
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1341,7 +1342,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LibreWMS 1.0.0 to adapt to many kinds of systems.
+\`configure' configures LibreWMS 1.0.0a to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1411,7 +1412,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LibreWMS 1.0.0:";;
+     short | recursive ) echo "Configuration of LibreWMS 1.0.0a:";;
    esac
   cat <<\_ACEOF
 
@@ -1442,6 +1443,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
+  --with-wxconfig=FILE    specify an alternative wx-config file
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -1535,7 +1537,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LibreWMS configure 1.0.0
+LibreWMS configure 1.0.0a
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2079,7 +2081,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LibreWMS $as_me 1.0.0, which was
+It was created by LibreWMS $as_me 1.0.0a, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2950,7 +2952,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='librewms'
- VERSION='1.0.0'
+ VERSION='1.0.0a'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15516,16 +15518,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-# Extract the first word of "wx-config", so it can be a program name with args.
+
+# Check whether --with-wxconfig was given.
+if test "${with_wxconfig+set}" = set; then :
+  withval=$with_wxconfig; WXCONFIG="$withval"
+else
+  WXCONFIG=""
+fi
+
+if test "x$WXCONFIG" = "x"; then
+      # WXCONFIG was not specified, so search within the current path
+      # Extract the first word of "wx-config", so it can be a program name with args.
 set dummy wx-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WX_CONFIG+:} false; then :
+if ${ac_cv_path_WXCONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $WX_CONFIG in
+  case $WXCONFIG in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_WX_CONFIG="$WX_CONFIG" # Let the user override the test with a path.
+  ac_cv_path_WXCONFIG="$WXCONFIG" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -15535,7 +15547,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_WX_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_WXCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -15543,26 +15555,39 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_WX_CONFIG" && ac_cv_path_WX_CONFIG="not_found"
   ;;
 esac
 fi
-WX_CONFIG=$ac_cv_path_WX_CONFIG
-if test -n "$WX_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG" >&5
-$as_echo "$WX_CONFIG" >&6; }
+WXCONFIG=$ac_cv_path_WXCONFIG
+if test -n "$WXCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WXCONFIG" >&5
+$as_echo "$WXCONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-if test x$WX_CONFIG == xnot_found; then
-  as_fn_error $? "cannot find wx-config (WxWidgets configuration helper), bailing out - try installing WxWidgets GTK development packages" "$LINENO" 5
+      # If we couldn't find wx-config, display an error
+      if test "x$WXCONFIG" = "x"; then
+              as_fn_error $? "could not find wx-config within the current path. You may need to try re-running configure with a --with-wxconfig parameter." "$LINENO" 5
+      fi
+else
+      # WXCONFIG was specified; display a message to the user
+      if test "x$WXCONFIG" = "xyes"; then
+              as_fn_error $? "you must specify a parameter to --with-wxconfig, e.g. --with-wxconfig=/path/to/wx-config" "$LINENO" 5
+      else
+              if test -f $WXCONFIG; then
+                      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using user-specified wx-config file: $WXCONFIG" >&5
+$as_echo "Using user-specified wx-config file: $WXCONFIG" >&6; }
+              else
+                      as_fn_error $? "the user-specified wx-config file $WXCONFIG does not exist" "$LINENO" 5
+              fi
+      fi
 fi
-CXXFLAGS="$(wx-config --cxxflags)"
-AM_CXXFLAGS="$(wx-config --cxxflags)"
-WX_LIBS="$(wx-config --libs)"
+CXXFLAGS=`$WXCONFIG --cxxflags`
+AM_CXXFLAGS=`$WXCONFIG --cxxflags`
+WX_LIBS=`$WXCONFIG --libs std,aui`
 
 
 # Checks for header files.
@@ -17099,7 +17124,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LibreWMS $as_me 1.0.0, which was
+This file was extended by LibreWMS $as_me 1.0.0a, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17165,7 +17190,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-LibreWMS config.status 1.0.0
+LibreWMS config.status 1.0.0a
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index eeb9ec7..004bb82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(LibreWMS, 1.0.0, a.furieri at lqt.it)
+AC_INIT(LibreWMS, 1.0.0a, a.furieri at lqt.it)
 AC_LANG(C)
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -20,13 +20,31 @@ AC_PROG_MAKE_SET
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_PATH_PROG(WX_CONFIG, wx-config, not_found)
-if test x$WX_CONFIG == xnot_found; then
-  AC_MSG_ERROR([cannot find wx-config (WxWidgets configuration helper), bailing out - try installing WxWidgets GTK development packages])
+AC_ARG_WITH([wxconfig],
+      [AS_HELP_STRING([--with-wxconfig=FILE], [specify an alternative wx-config file])],
+	[WXCONFIG="$withval"], [WXCONFIG=""])
+if test "x$WXCONFIG" = "x"; then
+      # WXCONFIG was not specified, so search within the current path
+      AC_PATH_PROG([WXCONFIG], [wx-config])	
+      # If we couldn't find wx-config, display an error
+      if test "x$WXCONFIG" = "x"; then
+              AC_MSG_ERROR([could not find wx-config within the current path. You may need to try re-running configure with a --with-wxconfig parameter.])
+      fi
+else
+      # WXCONFIG was specified; display a message to the user
+      if test "x$WXCONFIG" = "xyes"; then
+              AC_MSG_ERROR([you must specify a parameter to --with-wxconfig, e.g. --with-wxconfig=/path/to/wx-config])
+      else
+              if test -f $WXCONFIG; then
+                      AC_MSG_RESULT([Using user-specified wx-config file: $WXCONFIG])
+              else
+                      AC_MSG_ERROR([the user-specified wx-config file $WXCONFIG does not exist])
+              fi     
+      fi
 fi
-CXXFLAGS="$(wx-config --cxxflags)"
-AM_CXXFLAGS="$(wx-config --cxxflags)"
-WX_LIBS="$(wx-config --libs)"
+CXXFLAGS=`$WXCONFIG --cxxflags`
+AM_CXXFLAGS=`$WXCONFIG --cxxflags`
+WX_LIBS=`$WXCONFIG --libs std,aui`
 AC_SUBST(WX_LIBS)
 
 # Checks for header files.
diff --git a/gnome_resource/Makefile.in b/gnome_resource/Makefile.in
index 2105b3c..643f172 100644
--- a/gnome_resource/Makefile.in
+++ b/gnome_resource/Makefile.in
@@ -186,7 +186,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WX_CONFIG = @WX_CONFIG@
+WXCONFIG = @WXCONFIG@
 WX_LIBS = @WX_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 76e24eb..2751dab 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -186,7 +186,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WX_CONFIG = @WX_CONFIG@
+WXCONFIG = @WXCONFIG@
 WX_LIBS = @WX_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/mac_resource/Makefile.in b/mac_resource/Makefile.in
index ae3e251..6e2d714 100644
--- a/mac_resource/Makefile.in
+++ b/mac_resource/Makefile.in
@@ -186,7 +186,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WX_CONFIG = @WX_CONFIG@
+WXCONFIG = @WXCONFIG@
 WX_LIBS = @WX_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/win_resource/Makefile.in b/win_resource/Makefile.in
index f2e9127..d840169 100644
--- a/win_resource/Makefile.in
+++ b/win_resource/Makefile.in
@@ -186,7 +186,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WX_CONFIG = @WX_CONFIG@
+WXCONFIG = @WXCONFIG@
 WX_LIBS = @WX_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/librewms.git



More information about the Pkg-grass-devel mailing list