Changeset 3181 in orxonox.OLD

Timestamp:

Dec 15, 2004, 2:08:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: without-gtk/sdl makes more sense than enable. I think

Location:

orxonox/trunk

Files:

• configure (modified) (4 diffs)
• configure.ac (modified) (3 diffs)

orxonox/trunk/configure

@@ -865 +865 @@
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --disable-gtk           Prevents GTK from being loaded
-  --disable-sdl-image     Prevents SDL_image from being loaded
+  --enable-debug          compiles GTK in debug mode. Lots of Debug info about
+                          the game
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-debug            compiles GTK in debug mode. Lots of Debug info about
-                          the game
+  --without-gtk           Prevents GTK from being loaded
+  --without-sdl-image     Prevents SDL_image from being loaded
 
 Some influential environment variables:
@@ -3843 +3843 @@
 echo "$as_me:$LINENO: checking if DEBUG-mode should be enabled" >&5
 echo $ECHO_N "checking if DEBUG-mode should be enabled... $ECHO_C" >&6
-
-# Check whether --with-debug or --without-debug was given.
-if test "${with_debug+set}" = set; then
-  withval="$with_debug"
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
   DEBUG=yes
 fi;
@@ -3864 +3863 @@
 echo "$as_me:$LINENO: checking if gtk should be enabled" >&5
 echo $ECHO_N "checking if gtk should be enabled... $ECHO_C" >&6
-# Check whether --enable-gtk or --disable-gtk was given.
-if test "${enable_gtk+set}" = set; then
-  enableval="$enable_gtk"
+
+# Check whether --with-gtk or --without-gtk was given.
+if test "${with_gtk+set}" = set; then
+  withval="$with_gtk"
   def_gtk=no
 fi;
@@ -3879 +3879 @@
 echo "$as_me:$LINENO: checking if SDL_image should be enabled" >&5
 echo $ECHO_N "checking if SDL_image should be enabled... $ECHO_C" >&6
-# Check whether --enable-sdl_image or --disable-sdl_image was given.
-if test "${enable_sdl_image+set}" = set; then
-  enableval="$enable_sdl_image"
+
+# Check whether --with-sdl_image or --without-sdl_image was given.
+if test "${with_sdl_image+set}" = set; then
+  withval="$with_sdl_image"
   def_sdl_image=no
 fi;

orxonox/trunk/configure.ac

@@ -25 +25 @@
 DEBUG=no
 AC_MSG_CHECKING([if DEBUG-mode should be enabled])
-AC_ARG_WITH([debug], 
-        AC_HELP_STRING( [--with-debug], [compiles GTK in debug mode. Lots of Debug info about the game]),
+AC_ARG_ENABLE([debug], 
+        AC_HELP_STRING( [--enable-debug], [compiles GTK in debug mode. Lots of Debug info about the game]),
          [DEBUG=yes]) 
 echo "$DEBUG"
@@ -38 +38 @@
 def_gtk=yes
 AC_MSG_CHECKING([if gtk should be enabled])
-AC_ARG_ENABLE([gtk], 
-        AC_HELP_STRING( [--disable-gtk], 
+AC_ARG_WITH([gtk], 
+        AC_HELP_STRING( [--without-gtk], 
         [Prevents GTK from being loaded]), [def_gtk=no]) 
 if test "$def_gtk" = yes; then 
@@ -50 +50 @@
 def_sdl_image=yes
 AC_MSG_CHECKING([if SDL_image should be enabled])
-AC_ARG_ENABLE([sdl_image], 
-        AC_HELP_STRING( [--disable-sdl-image], 
+AC_ARG_WITH([sdl_image], 
+        AC_HELP_STRING( [--without-sdl-image], 
         [Prevents SDL_image from being loaded]), [def_sdl_image=no]) 
 if test "$def_sdl_image" = yes; then