Merge pull request #4 from mariuz/master

Merge from master

.github/workflows/ccpp.yml

@@ -0,0 +1,23 @@
+name: C/C++ CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+    - name: make check
+      run: make check
+    - name: make distcheck
+      run: make distcheck

BUILD.txt

@@ -35,7 +35,7 @@ $(BOOST_ROOT)/stage/lib, but you may have changed that. For systems where
 both 32 and 64 bit versions of FlameRobin are to be built consider the
 following Stack Overflow post about how to build Boost in both versions:
 
-  http://stackoverflow.com/a/2326485/30568
+  https://stackoverflow.com/a/2326485/30568
   (accepted answer to "64-bit version of Boost for 64-bit windows")
 
 For the sole purpose of building FlameRobin only a few libraries are needed,
@@ -179,30 +179,31 @@ question there.
 
 
 --------------------------------------------
--- Mac OS X - Autoconf Build Instructions --
+-- Mac OS  - Autoconf Build Instructions --
 --------------------------------------------
 
-To build FlameRobin on Mac OS X 10.5 minimum, open
+Before compiling you need to install these packages (easily with brew)
+
+brew install autoconf
+brew install wxwidgets
+brew install boost
+
+To build FlameRobin on Mac OS 10.5 minimum, open
 a command line, cd into the flamerobin root directory, and execute the
 following commands:
 
-
 cd ..
-mkdir x86_64
-cd x86_64
-../configure --disable-debug --disable-dependency-tracking \
-  CFLAGS="-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5u.sdk" \
-  LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk \
-    -Wl,-macosx_version_min -Wl,10.5" \
-  CXXFLAGS="-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5u.sdk" \
-  --with-wx-config=/my/path/to/wx-config_for_x86_64_unicode
+mkdir release
+cd release
+../configure --disable-debug --disable-dependency-tracking
 make
+make install
+
+Now you will have working Flamerobin.app which you should move to /Applications folder.
 
 The resulting bundles differ only in the flamerobin executable, the lipo
 tool can be used to make a Universal Build out of them.
 
-
-
 ----------------------------------------------
 -- Unix - Building wxWidgets with configure --
 ----------------------------------------------

configure

@@ -790,7 +790,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -883,7 +882,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1136,15 +1134,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1282,7 +1271,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1435,7 +1424,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -16476,7 +16464,7 @@ case "${host}" in
             ;;
 
     *-*-darwin* )
-                LIBS="$LIBS -framework Firebird"
+                LIBS="$LIBS /Library/Frameworks/Firebird.Framework/Firebird"
     ;;
 
     * )

configure.ac

@@ -58,7 +58,7 @@ case "${host}" in
 
     *-*-darwin* )
         dnl Mac OS X uses the Firebird framework
-        LIBS="$LIBS -framework Firebird"
+        LIBS="$LIBS /Library/Frameworks/Firebird.Framework/Firebird"
     ;;
 
     * )