fixed broken non-unicode build
[public/netxms.git] / reconf
diff --git a/reconf b/reconf
old mode 100644 (file)
new mode 100755 (executable)
index 77774ca..2bed62d
--- a/reconf
+++ b/reconf
@@ -9,31 +9,29 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-ACLOCAL=aclocal-1.7
-AUTOCONF=autoconf-2.60
-AUTOHEADER=autoheader-2.60
-AUTOMAKE=automake-1.7
-LIBTOOLIZE=libtoolize
-
-if [ `uname -s` = "FreeBSD" ]; then
-       ACLOCAL=aclocal19
-       AUTOCONF=autoconf259
-       AUTOHEADER=autoheader259
-       AUTOMAKE=automake19
-       LIBTOOLIZE=libtoolize15
-fi
+autoreconf -fi -W none,obsolete,syntax
+exit $?
 
-if [ "$1" = "-n" ]; then
-       ACLOCAL=aclocal
-       AUTOCONF=autoconf
-       AUTOHEADER=autoheader
-       AUTOMAKE=automake
+ACLOCAL=aclocal
+AUTOCONF=autoconf
+AUTOHEADER=autoheader
+AUTOMAKE=automake
+if test -x "`which libtoolize`"; then
        LIBTOOLIZE=libtoolize
 fi
+if test -x "`which glibtoolize`"; then
+       LIBTOOLIZE=glibtoolize
+fi
 
 mkdir -p config
 touch README
 
+echo \*\*\* ACLOCAL: `which $ACLOCAL`
+echo \*\*\* AUTOCONF: `which $AUTOCONF`
+echo \*\*\* AUTOHEADER: `which $AUTOHEADER`
+echo \*\*\* AUTOMAKE: `which $AUTOMAKE`
+echo \*\*\* LIBTOOLIZE: `which $LIBTOOLIZE`
+
 rm -f config.cache &&
 [ ! -f config/ltmain.sh ] && $LIBTOOLIZE
 echo "- aclocal." &&
@@ -44,4 +42,14 @@ echo "- autoheader." &&
 $AUTOHEADER &&
 echo "- automake." &&
 $AUTOMAKE -a &&
+chmod 755 configure
+
+if test -d src/private; then
+       FILES=`cat src/private/configure.files`
+       for file in $FILES; do
+               echo "Processing $file"
+               $AUTOMAKE $file
+       done
+fi
+
 exit $?