updated to work on current OpenSUSE Tumbleweed

Author: thorgrin

base/configure.ac

@@ -131,7 +131,7 @@ AC_CHECK_LIB([xml2], [main],
 ### TLS support ###
 save_libs="$LIBS"
 AS_IF([test "x$with_openssl" != xno],
-  [AC_SEARCH_LIBS([SSL_library_init], [ssl :libssl.so.10],
+  [AC_SEARCH_LIBS([SSL_library_init], [ssl :libssl.so.10 :libssl.so.1.0.0],
     [TLS_SUPPORT="yes"
     # Check for pkg-config
 	AC_CHECK_PROG([PKG_CONFIG], [pkg-config], ["yes"], ["no"])

base/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

base/src/intermediate/timecheck/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

base/src/intermediate/timenow/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/input/nfdump/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/input/udp_cpg/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/intermediate/dhcp/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/intermediate/geoip/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/intermediate/profile_stats/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/intermediate/profiler/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/intermediate/stats/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/intermediate/uid/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/storage/fastbit/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/storage/fastbit_compression/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/storage/json/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/storage/lnfstore/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/storage/nfdump/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/storage/postgres/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/storage/statistics/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

plugins/storage/unirec/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

tools/fbitconvert/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

tools/fbitdump/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

tools/fbitexpire/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

tools/fbitmerge/m4/lbr_set_distro.m4

@@ -26,7 +26,7 @@ AC_DEFUN([LBR_SET_DISTRO],
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'

tools/profilesdaemon/m4/lbr_set_distro.m4

@@ -10,20 +10,23 @@
 # The user option always superseeds other settings.
 #
 # Currently the macro recognizes following distributions:
+#
 # redhat
-# debian
-# mandrake
 # suse
+# mandrake
+# debian
+# arch
 #
 # Author: Petr Velan <[email protected]>
-# Modified: 2012-05-03
+# Modified: 2015-06-12
 #
 AC_DEFUN([LBR_SET_DISTRO],
 [m4_ifval([$1],[DISTRO=$1],[DISTRO="redhat"])
+
 # Autodetect current distribution
 if test -f /etc/redhat-release; then
 	DISTRO=redhat
-elif test -f /etc/SuSE-release; then
+elif test -f /etc/SuSE-release -o -f /etc/SUSE-brand; then
 	DISTRO=suse
 elif test -f /etc/mandrake-release; then
 	DISTRO='mandrake'
@@ -32,6 +35,7 @@ elif test -f /etc/debian_version; then
 elif test -f /etc/arch-release; then
 	DISTRO=arch
 fi
+
 # Check if distribution was specified manually
 AC_ARG_WITH([distro],
 	AC_HELP_STRING([--with-distro=DISTRO],[Compile for specific Linux distribution]),