[Scummvm-cvs-logs] SF.net SVN: scummvm: [28113] scummex/branches/gsoc2007-gameresbrowser

zbychs at users.sourceforge.net zbychs at users.sourceforge.net
Sun Jul 15 22:55:58 CEST 2007


Revision: 28113
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28113&view=rev
Author:   zbychs
Date:     2007-07-15 13:55:57 -0700 (Sun, 15 Jul 2007)

Log Message:
-----------
Added --with-wxconfig=arg option to the configure

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/configure
    scummex/branches/gsoc2007-gameresbrowser/configure.ac

Modified: scummex/branches/gsoc2007-gameresbrowser/configure
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/configure	2007-07-15 19:26:00 UTC (rev 28112)
+++ scummex/branches/gsoc2007-gameresbrowser/configure	2007-07-15 20:55:57 UTC (rev 28113)
@@ -1260,6 +1260,8 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-wxversion=2.8    give a specific wxWidgets version
+  --with-wxconfig=wx-config
+                          give a path to wxWidgets configurer
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -2272,7 +2274,21 @@
 fi
 
 
-# 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;
+else
+  with_wxconfig=notset
+fi
+
+
+if test "x$with_wxconfig" != xnotset; then
+  WX_CONFIG="$with_wxconfig"
+
+else
+
+				# Extract the first word of "wx-config", so it can be a program name with args.
 set dummy wx-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
@@ -2314,12 +2330,16 @@
 fi
 
 
-if [ "$WX_CONFIG" = "no" ] ; then
-     { { echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path?\"" >&5
-echo "$as_me: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path?\"" >&2;}
+		if [ "$WX_CONFIG" = "no" ] ; then
+		     { { echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path? Try --with-wxconfig=/path/to/wx-config option\"" >&5
+echo "$as_me: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path? Try --with-wxconfig=/path/to/wx-config option\"" >&2;}
    { (exit 1); exit 1; }; }
+		fi
+
 fi
 
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

Modified: scummex/branches/gsoc2007-gameresbrowser/configure.ac
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/configure.ac	2007-07-15 19:26:00 UTC (rev 28112)
+++ scummex/branches/gsoc2007-gameresbrowser/configure.ac	2007-07-15 20:55:57 UTC (rev 28113)
@@ -46,12 +46,23 @@
             [AC_SUBST([WX_VERSION_OPT], ["--version=$with_wxversion"])],
 	    [])
 
-dnl wxWindows -- we assume that if wx-config is found, wxWindows is successfully installed.
-AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin )
-if [[ "$WX_CONFIG" = "no" ]] ; then
-     AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is wx-config in your path?")
-fi
+AC_ARG_WITH([wxconfig],
+            [AS_HELP_STRING([--with-wxconfig=wx-config],
+              [give a path to wxWidgets configurer])],
+            [],
+            [with_wxconfig=notset])
 
+AS_IF([test "x$with_wxconfig" != xnotset],
+            [AC_SUBST([WX_CONFIG], ["$with_wxconfig"])],
+	    [
+		dnl wxWindows -- we assume that if wx-config is found, wxWindows is successfully installed.
+		AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin )
+		if [[ "$WX_CONFIG" = "no" ]] ; then
+		     AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is wx-config in your path? Try --with-wxconfig=/path/to/wx-config option")
+		fi
+	    ])
+
+
 AC_PROG_CXX
 AC_PROG_RANLIB
 AC_CONFIG_HEADERS([config.h])


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




More information about the Scummvm-git-logs mailing list