Merge commit 'release-4-0-0alpha1' into v4-0-test

[ira/wip.git] / source4 / dynconfig.h

diff --git a/source4/dynconfig.h b/source4/dynconfig.h
index 312283c5fb05af1bbb8cc0e706ae3ab7c3cf4b45..ac54db63d699236469277220a4dcd4c60783d3c4 100644 (file)
--- a/source4/dynconfig.h
+++ b/source4/dynconfig.h
@@ -6,7 +6,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**
@@ -32,7 +31,6 @@ extern const char *dyn_LOGFILEBASE;
 extern const char *dyn_LMHOSTSFILE;
 extern const char *dyn_DATADIR;
 extern const char *dyn_MODULESDIR;
-extern const char *dyn_SHLIBEXT;
 extern const char *dyn_LOCKDIR; 
 extern const char *dyn_PIDDIR;
 extern const char *dyn_PRIVATE_DIR;
@@ -40,4 +38,3 @@ extern const char *dyn_SWATDIR;
 extern const char *dyn_JSDIR;
 extern const char *dyn_SETUPDIR;
 extern const char *dyn_WINBINDD_SOCKET_DIR;
-extern const char *dyn_TORTUREDIR;