Remove the keyword extern to avoid the multiple declaration of the the variables...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1fd4950..79ddfa4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,8 @@
+dnl Copyright (C) 2004-2007. The SimGrid team. All rights reserved.
+
+dnl This file is part of the SimGrid project. This is free software:
+dnl You can redistribute and/or modify it under the terms of the
+dnl GNU LGPL (v2.1) licence.

 
 ######################
 ## Setup the autotools
 
 ######################
 ## Setup the autotools


@@ -358,17 +363,15 @@ SG_CONFIGURE_PART(Check for Java bindings...)
 # Java cruft
 AC_ARG_ENABLE(java,
              AS_HELP_STRING([--disable-java], [To not compile the Java bindings even if the tools are found]),
 # Java cruft
 AC_ARG_ENABLE(java,
              AS_HELP_STRING([--disable-java], [To not compile the Java bindings even if the tools are found]),

-             want_java=$enableval,want_java=yes)
-if test "x$want_java" != "xyes" ; then
-   AC_MSG_CHECKING(whether to compile java bindings)
-   AC_MSG_RESULT(disabled by user)
+             disable_java=$enableval,disable_java=yes)
+AC_MSG_CHECKING(whether to compile java bindings)
+if test "x$disable_java" != "xyes" ; then

    use_java="disabled by user"
 else
   AC_PATH_PROG([JAVAC], [javac], `which javac`)
   AC_PATH_PROG([JAVA],  [java] , `which java`)
   AC_PATH_PROG([JAR],   [jar]  , `which jar`)
   AC_CHECK_HEADERS(jni.h)
    use_java="disabled by user"
 else
   AC_PATH_PROG([JAVAC], [javac], `which javac`)
   AC_PATH_PROG([JAVA],  [java] , `which java`)
   AC_PATH_PROG([JAR],   [jar]  , `which jar`)
   AC_CHECK_HEADERS(jni.h)

-  AC_MSG_CHECKING(whether to compile java bindings)

   if test -n "$JAVAC"   \
      && test -n "$JAVA" \
      && test -n "$JAR"  \
   if test -n "$JAVAC"   \
      && test -n "$JAVA" \
      && test -n "$JAR"  \


@@ -378,8 +381,8 @@ else
   else   
      use_java="no"
   fi
   else   
      use_java="no"
   fi

-  AC_MSG_RESULT($use_java)

 fi
 fi

+AC_MSG_RESULT($use_java)

 AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
 #####################
 AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
 #####################