Thread: [Wxlua-commit] wxLua Makefile.in,1.4,1.5 configure,1.4,1.5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398

Modified Files:
	Makefile.in configure 
Log Message:
updated bakefiles

Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in	20 Nov 2005 11:35:17 -0000	1.4
--- Makefile.in	23 Jan 2006 19:38:28 -0000	1.5
***************
*** 1,5 ****
  # =========================================================================
  #     This makefile was generated by
! #     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
--- 1,5 ----
  # =========================================================================
  #     This makefile was generated by
! #     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
***************
*** 11,14 ****
--- 11,18 ----
  exec_prefix = @exec_prefix@
  INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_DIR = @INSTALL_DIR@
+ srcdir = @srcdir@
+ libdir = @libdir@

  ### Variables: ###
***************
*** 26,39 ****

  install: all
! 	(cd ./util/ && $(MAKE) install)
! 	(cd ./modules/ && $(MAKE) install)
! 	(cd ./apps/ && $(MAKE) install)

  uninstall: 

  install-strip: install
- 	(cd ./util/ && $(MAKE) install-strip)
- 	(cd ./modules/ && $(MAKE) install-strip)
- 	(cd ./apps/ && $(MAKE) install-strip)

  clean: 
--- 30,40 ----

  install: all
! 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig
! 	(cd $(srcdir)/ ; $(INSTALL_DATA)  build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig)

  uninstall: 
+ 	(cd $(DESTDIR)$(libdir)/pkgconfig ; rm -f wxlua.pc)

  install-strip: install

  clean: 

Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure	26 Nov 2005 14:20:30 -0000	1.4
--- configure	23 Jan 2006 19:38:29 -0000	1.5
***************
*** 948,952 ****
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
!     cd $ac_popdir
    done
  fi
--- 948,952 ----
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
!     cd "$ac_popdir"
    done
  fi
***************
*** 1362,1365 ****
--- 1362,1375 ----

+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  ac_aux_dir=
  for ac_dir in build/autoconf $srcdir/build/autoconf; do
***************
*** 1517,1520 ****
--- 1527,1537 ----

+ # Global wxLua options:
+ # we could use these to define options like --enable-all-apps or --enable-all-utils
+ # but these would be rather uncommon options in Unix world and thus we'll leave these
+ # options fixed to their default values
+ USE_UTIL=1
+ USE_APPS=1
+ 

***************
*** 2679,2684 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 2696,2700 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 2738,2743 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 2754,2758 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 2855,2860 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 2870,2874 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 2910,2915 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 2924,2928 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 2956,2961 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 2969,2973 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 3001,3006 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 3013,3017 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 3186,3191 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 3197,3201 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 3245,3250 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 3255,3259 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 3317,3322 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 3326,3330 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 3362,3367 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 3370,3374 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 3751,3755 ****
      fi

!     WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS ,core,base"

      WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
--- 3758,3762 ----
      fi

!     WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS xrc,html,media,adv,net,xml,core,base"

      WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
***************
*** 4497,4502 ****

!                                                             if [ "$WX_DEBUG" = "1" ]; then

                                                                                                  CXXFLAGS="$CXXFLAGS -g -O0 -Wall -Wundef -Wno-ctor-dtor-privacy"
--- 4504,4526 ----

+                                     if test -n "" ; then
+ 
+             if test "$WX_PORT" = "gtk" ; then
+                                                                 if test "$WX_GTKPORT_VERSION" = "1" ; then
+                     _GTKPKG_FL="gtk-config --cflags"
+                     GTKPKG_FLAGS=`$_GTKPKG_FL`
+                 else
+                     _GTKPKG_FL="pkg-config --cflags gtk+-2.0"
+                     GTKPKG_FLAGS=`$_GTKPKG_FL`
+                 fi
+             fi
+ 
+ 
+                                 CXXFLAGS="$CXXFLAGS $GTKPKG_FLAGS"
+                 CFLAGS="$CFLAGS $GTKPKG_FLAGS"
+             fi

! 
!                                                 if [ "$WX_DEBUG" = "1" ]; then

                                                                                                  CXXFLAGS="$CXXFLAGS -g -O0 -Wall -Wundef -Wno-ctor-dtor-privacy"
***************
*** 4519,4522 ****
--- 4543,4552 ----

      if test "x$BAKEFILE_HOST" = "x"; then
+                if test "x${host}" = "x" ; then
+                        { { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5
+ echo "$as_me: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&2;}
+    { (exit 1); exit 1; }; }
+                fi
+ 
          BAKEFILE_HOST="${host}"
      fi
***************
*** 5232,5236 ****

                          #ifndef __INTEL_COMPILER
!                         #error Not icc
                          #endif

--- 5262,5266 ----

                          #ifndef __INTEL_COMPILER
!                         #error Not ICC
                          #endif

***************
*** 5248,5253 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 5278,5282 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 5425,5430 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"
! 			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
--- 5454,5458 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 6428,6435 ****

!     BAKEFILE_BAKEFILE_M4_VERSION="0.1.9"

! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.9"

      COND_DEPS_TRACKING_0="#"
--- 6456,6463 ----

!     BAKEFILE_BAKEFILE_M4_VERSION="0.2.0"

! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.0"

      COND_DEPS_TRACKING_0="#"
***************
*** 6557,6561 ****
      fi

!                                         ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile util/Makefile"

  cat >confcache <<\_ACEOF
--- 6585,6589 ----
      fi

!                                                   ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile util/Makefile build/autoconf/wxlua.pc"

  cat >confcache <<\_ACEOF
***************
*** 7114,7117 ****
--- 7142,7146 ----
    "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
    "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
+   "build/autoconf/wxlua.pc" ) CONFIG_FILES="$CONFIG_FILES build/autoconf/wxlua.pc" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
***************
*** 7472,7480 ****
    esac

-   if test x"$ac_file" != x-; then
-     { echo "$as_me:$LINENO: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
--- 7501,7504 ----
***************
*** 7515,7518 ****
--- 7539,7548 ----
        esac
      done` || { (exit 1); exit 1; }
+ 
+   if test x"$ac_file" != x-; then
+     { echo "$as_me:$LINENO: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF

Thread: [Wxlua-commit] wxLua Makefile.in,1.4,1.5 configure,1.4,1.5

wxlua-commit