[Opalvoip-svn] SF.net SVN: opalvoip:[34635] opal/trunk

[<rjo...@us...>]

Revision: 34635
          http://sourceforge.net/p/opalvoip/code/34635
Author:   rjongbloed
Date:     2016-02-18 12:30:26 +0000 (Thu, 18 Feb 2016)
Log Message:
-----------
Move wxWidgets make flags to PTLib make infrastructure. Tweak flags for silly warning on wxWidgets based apps.

Modified Paths:
--------------
    opal/trunk/configure
    opal/trunk/make/my_macros.m4
    opal/trunk/plugins/configure
    opal/trunk/samples/opalshark/Makefile
    opal/trunk/samples/openphone/Makefile

Modified: opal/trunk/configure
===================================================================
--- opal/trunk/configure	2016-02-18 12:23:12 UTC (rev 34634)
+++ opal/trunk/configure	2016-02-18 12:30:26 UTC (rev 34635)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OPAL 3.17beta1.
+# Generated by GNU Autoconf 2.69 for OPAL 3.17alpha1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='OPAL'
 PACKAGE_TARNAME='opal'
-PACKAGE_VERSION='3.17beta1'
-PACKAGE_STRING='OPAL 3.17beta1'
+PACKAGE_VERSION='3.17alpha1'
+PACKAGE_STRING='OPAL 3.17alpha1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -748,6 +748,7 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+GIT
 SVN
 MKDIR_P
 RANLIB
@@ -1451,7 +1452,7 @@
   # 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 OPAL 3.17beta1 to adapt to many kinds of systems.
+\`configure' configures OPAL 3.17alpha1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1517,7 +1518,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OPAL 3.17beta1:";;
+     short | recursive ) echo "Configuration of OPAL 3.17alpha1:";;
    esac
   cat <<\_ACEOF
 
@@ -1698,7 +1699,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OPAL configure 3.17beta1
+OPAL configure 3.17alpha1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2314,7 +2315,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OPAL $as_me 3.17beta1, which was
+It was created by OPAL $as_me 3.17alpha1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4208,7 +4209,47 @@
 fi
 
 
+# Extract the first word of "git", so it can be a program name with args.
+set dummy git; 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_GIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GIT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GIT="$GIT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  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_GIT="$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
+done
+  done
+IFS=$as_save_IFS
 
+  ;;
+esac
+fi
+GIT=$ac_cv_path_GIT
+if test -n "$GIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
+$as_echo "$GIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -5532,7 +5573,7 @@
 
 case "$target_os" in
    darwin* | iPhone* )
-      SHARED_LDFLAGS="-dynamiclib"
+      SHARED_LDFLAGS='-dynamiclib -Wl,-install_name,@executable_path/$(LIB_SONAME)'
       SHAREDLIBEXT="dylib"
       DEBUGINFOEXT="dSYM"
       AR="libtool"
@@ -5570,8 +5611,7 @@
       target_os=Darwin
       target_release=`sw_vers -productVersion`
 
-      CPPFLAGS="-I/opt/local/include -mmacosx-version-min=10.8 $CPPFLAGS"
-      LDFLAGS="-L/opt/local/lib $LDFLAGS"
+      CPPFLAGS="-mmacosx-version-min=10.8 $CPPFLAGS"
       LIBS="-framework QTKit -framework CoreVideo -framework AudioUnit $LIBS"
    ;;
 
@@ -6103,6 +6143,40 @@
 
 
 
+
+   oldCPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS -Werror -Wno-potentially-evaluated-expression"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Disable potentially evaluated expression warning (-Wno-potentially-evaluated-expression)" >&5
+$as_echo_n "checking Disable potentially evaluated expression warning (-Wno-potentially-evaluated-expression)... " >&6; }
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  usable=yes
+else
+  usable=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $usable" >&5
+$as_echo "$usable" >&6; }
+   CPPFLAGS="$oldCPPFLAGS"
+
+   if test "x$usable" = "xyes"; then :
+  CXXFLAGS="$CXXFLAGS -Wno-potentially-evaluated-expression"
+
+fi
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11765,7 +11839,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OPAL $as_me 3.17beta1, which was
+This file was extended by OPAL $as_me 3.17alpha1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11831,7 +11905,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OPAL config.status 3.17beta1
+OPAL config.status 3.17alpha1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: opal/trunk/make/my_macros.m4
===================================================================
--- opal/trunk/make/my_macros.m4	2016-02-18 12:23:12 UTC (rev 34634)
+++ opal/trunk/make/my_macros.m4	2016-02-18 12:30:26 UTC (rev 34635)
@@ -416,6 +416,7 @@
 dnl AC_PROG_MKDIR_P()  -- Doesn't work!
 AC_SUBST(MKDIR_P, "mkdir -p")
 AC_PATH_PROG(SVN, svn)
+AC_PATH_PROG(GIT, git)
 
 AC_PROG_INSTALL()
 AC_MSG_CHECKING([install support for -C])
@@ -468,7 +469,7 @@
 
 case "$target_os" in
    darwin* | iPhone* )
-      SHARED_LDFLAGS="-dynamiclib"
+      SHARED_LDFLAGS='-dynamiclib -Wl,-install_name,@executable_path/$(LIB_SONAME)'
       SHAREDLIBEXT="dylib"
       DEBUGINFOEXT="dSYM"
       AR="libtool"
@@ -503,8 +504,7 @@
       target_os=Darwin
       target_release=`sw_vers -productVersion`
 
-      CPPFLAGS="-I/opt/local/include -mmacosx-version-min=10.8 $CPPFLAGS"
-      LDFLAGS="-L/opt/local/lib $LDFLAGS"
+      CPPFLAGS="-mmacosx-version-min=10.8 $CPPFLAGS"
       LIBS="-framework QTKit -framework CoreVideo -framework AudioUnit $LIBS"
    ;;
 
@@ -717,6 +717,14 @@
    [CXXFLAGS="$CXXFLAGS -Wno-deprecated-declarations"]
 )
 
+MY_COMPILE_IFELSE(
+   [Disable potentially evaluated expression warning (-Wno-potentially-evaluated-expression)],
+   [-Werror -Wno-potentially-evaluated-expression],
+   [],
+   [],
+   [CXXFLAGS="$CXXFLAGS -Wno-potentially-evaluated-expression"]
+)
+
 AC_LANG_POP(C++)
 
 MY_COMPILE_IFELSE(

Modified: opal/trunk/plugins/configure
===================================================================
--- opal/trunk/plugins/configure	2016-02-18 12:23:12 UTC (rev 34634)
+++ opal/trunk/plugins/configure	2016-02-18 12:30:26 UTC (rev 34635)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OPAL-Plugins 3.17beta1.
+# Generated by GNU Autoconf 2.69 for OPAL-Plugins 3.17alpha1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='OPAL-Plugins'
 PACKAGE_TARNAME='opal-plugins'
-PACKAGE_VERSION='3.17beta1'
-PACKAGE_STRING='OPAL-Plugins 3.17beta1'
+PACKAGE_VERSION='3.17alpha1'
+PACKAGE_STRING='OPAL-Plugins 3.17alpha1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -723,6 +723,7 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+GIT
 SVN
 MKDIR_P
 RANLIB
@@ -1432,7 +1433,7 @@
   # 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 OPAL-Plugins 3.17beta1 to adapt to many kinds of systems.
+\`configure' configures OPAL-Plugins 3.17alpha1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1498,7 +1499,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OPAL-Plugins 3.17beta1:";;
+     short | recursive ) echo "Configuration of OPAL-Plugins 3.17alpha1:";;
    esac
   cat <<\_ACEOF
 
@@ -1697,7 +1698,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OPAL-Plugins configure 3.17beta1
+OPAL-Plugins configure 3.17alpha1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2313,7 +2314,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OPAL-Plugins $as_me 3.17beta1, which was
+It was created by OPAL-Plugins $as_me 3.17alpha1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4207,7 +4208,47 @@
 fi
 
 
+# Extract the first word of "git", so it can be a program name with args.
+set dummy git; 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_GIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GIT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GIT="$GIT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  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_GIT="$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
+done
+  done
+IFS=$as_save_IFS
 
+  ;;
+esac
+fi
+GIT=$ac_cv_path_GIT
+if test -n "$GIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
+$as_echo "$GIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -5531,7 +5572,7 @@
 
 case "$target_os" in
    darwin* | iPhone* )
-      SHARED_LDFLAGS="-dynamiclib"
+      SHARED_LDFLAGS='-dynamiclib -Wl,-install_name,@executable_path/$(LIB_SONAME)'
       SHAREDLIBEXT="dylib"
       DEBUGINFOEXT="dSYM"
       AR="libtool"
@@ -5569,8 +5610,7 @@
       target_os=Darwin
       target_release=`sw_vers -productVersion`
 
-      CPPFLAGS="-I/opt/local/include -mmacosx-version-min=10.8 $CPPFLAGS"
-      LDFLAGS="-L/opt/local/lib $LDFLAGS"
+      CPPFLAGS="-mmacosx-version-min=10.8 $CPPFLAGS"
       LIBS="-framework QTKit -framework CoreVideo -framework AudioUnit $LIBS"
    ;;
 
@@ -6102,6 +6142,40 @@
 
 
 
+
+   oldCPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS -Werror -Wno-potentially-evaluated-expression"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Disable potentially evaluated expression warning (-Wno-potentially-evaluated-expression)" >&5
+$as_echo_n "checking Disable potentially evaluated expression warning (-Wno-potentially-evaluated-expression)... " >&6; }
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  usable=yes
+else
+  usable=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $usable" >&5
+$as_echo "$usable" >&6; }
+   CPPFLAGS="$oldCPPFLAGS"
+
+   if test "x$usable" = "xyes"; then :
+  CXXFLAGS="$CXXFLAGS -Wno-potentially-evaluated-expression"
+
+fi
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12129,7 +12203,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OPAL-Plugins $as_me 3.17beta1, which was
+This file was extended by OPAL-Plugins $as_me 3.17alpha1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12191,7 +12265,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OPAL-Plugins config.status 3.17beta1
+OPAL-Plugins config.status 3.17alpha1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: opal/trunk/samples/opalshark/Makefile
===================================================================
--- opal/trunk/samples/opalshark/Makefile	2016-02-18 12:23:12 UTC (rev 34634)
+++ opal/trunk/samples/opalshark/Makefile	2016-02-18 12:30:26 UTC (rev 34635)
@@ -28,45 +28,10 @@
 
 PROG		:= opalshark
 SOURCES		:= main.cxx opalshark.cxx
-
 VERSION_FILE    := version.h
+USING_WX_WIDGETS:=yes
 
-WX_CONFIG := $(firstword $(wildcard $(addsuffix /wx-config,$(subst :, ,$(PATH):/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin))))
-ifneq (,$(WX_CONFIG))
-  WXRC := $(dir $(WX_CONFIG))/wxrc
-else
-  WX_CONFIG := $(firstword $(wildcard $(addsuffix /wxgtk2u-2.8-config,$(subst :, ,$(PATH)))))
-  ifneq (,$(WX_CONFIG))
-    WXRC := $(dir $(WX_CONFIG))/wxrc-gtk2u-2.8
-  else
-    WX_CONFIG := wx-config-3.0
-    ifneq (,$(shell which $(WX_CONFIG) 2>&1))
-      WXRC := wxrc-3.0
-    else
-      WX_CONFIG := wx-config
-      ifneq (,$(shell which $(WX_CONFIG) 2>&1))
-        WXRC := wxrc
-      else
-        $(error Could not find wx-config)
-      endif
-    endif
-  endif
-endif
 
-ifneq (,$(DEBUG_BUILD))
-  ifneq (,$(shell $(WX_CONFIG) --list | grep debug))
-    WX_CONFIG += --debug=$(DEBUG_BUILD)
-  else
-    CPPFLAGS += -DOPAL_WX_DEBUG_HACK
-  endif
-endif
-
-CPPFLAGS += $(shell $(WX_CONFIG) --cppflags)
-CXXFLAGS += $(shell $(WX_CONFIG) --cxxflags)
-CFLAGS   += $(shell $(WX_CONFIG) --cflags)
-LDFLAGS  += $(shell $(WX_CONFIG) --libs)
-
-
 # Need this before the include of opal.mak
 .DEFAULT_GOAL := bundle
 

Modified: opal/trunk/samples/openphone/Makefile
===================================================================
--- opal/trunk/samples/openphone/Makefile	2016-02-18 12:23:12 UTC (rev 34634)
+++ opal/trunk/samples/openphone/Makefile	2016-02-18 12:30:26 UTC (rev 34635)
@@ -28,45 +28,10 @@
 
 PROG		:= openphone
 SOURCES		:= main.cxx openphone.cxx
-
 VERSION_FILE    := version.h
+USING_WX_WIDGETS:=yes
 
-WX_CONFIG := $(firstword $(wildcard $(addsuffix /wx-config,$(subst :, ,$(PATH):/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin))))
-ifneq (,$(WX_CONFIG))
-  WXRC := $(dir $(WX_CONFIG))/wxrc
-else
-  WX_CONFIG := $(firstword $(wildcard $(addsuffix /wxgtk2u-2.8-config,$(subst :, ,$(PATH)))))
-  ifneq (,$(WX_CONFIG))
-    WXRC := $(dir $(WX_CONFIG))/wxrc-gtk2u-2.8
-  else
-    WX_CONFIG := wx-config-3.0
-    ifneq (,$(shell which $(WX_CONFIG) 2>&1))
-      WXRC := wxrc-3.0
-    else
-      WX_CONFIG := wx-config
-      ifneq (,$(shell which $(WX_CONFIG) 2>&1))
-        WXRC := wxrc
-      else
-        $(error Could not find wx-config)
-      endif
-    endif
-  endif
-endif
 
-ifneq (,$(DEBUG_BUILD))
-  ifneq (,$(shell $(WX_CONFIG) --list | grep debug))
-    WX_CONFIG += --debug=$(DEBUG_BUILD)
-  else
-    CPPFLAGS += -DOPAL_WX_DEBUG_HACK
-  endif
-endif
-
-CPPFLAGS += $(shell $(WX_CONFIG) --cppflags)
-CXXFLAGS += $(shell $(WX_CONFIG) --cxxflags)
-CFLAGS   += $(shell $(WX_CONFIG) --cflags)
-LDFLAGS  += $(shell $(WX_CONFIG) --libs)
-
-
 # Need this before the include of opal.mak
 .DEFAULT_GOAL := bundle
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.