And now get everything building again...

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@588037 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

configure.in.in

@@ -1,18 +1,114 @@
+dnl    This file is part of the KDE libraries/packages
+dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
+dnl                       modified by Walter Tasin (tasin@kdevelop.org)
+dnl                       for c++ console applications
+
+dnl    This file is free software; you can redistribute it and/or
+dnl    modify it under the terms of the GNU Library General Public
+dnl    License as published by the Free Software Foundation; either
+dnl    version 2 of the License, or (at your option) any later version.
+
+dnl    This library is distributed in the hope that it will be useful,
+dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl    Library General Public License for more details.
+
+dnl    You should have received a copy of the GNU Library General Public License
+dnl    along with this library; see the file COPYING.LIB.  If not, write to
+dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+dnl    Boston, MA 02111-1307, USA.
+
+# Original Author was Kalle@kde.org
+# I lifted it in some mater. (Stephan Kulow)
+# I used much code from Janos Farkas
+
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT(acinclude.m4) dnl a source file from your sub dir
+
+dnl This is so we can use kde-common
+AC_CONFIG_AUX_DIR(admin)
+
+dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
+unset CDPATH
+
+dnl Checking host/target/build systems, for make, install etc.
+AC_CANONICAL_SYSTEM
+dnl Perform program name transformation
+AC_ARG_PROGRAM
+
+dnl Automake doc recommends to do this only here. (Janos)
+AM_INIT_AUTOMAKE(taglib,1.4)
+
+dnl almost the same like KDE_SET_PEFIX but the path is /usr/local
+dnl
+unset CDPATH
+dnl make /usr/local the default for the installation
+AC_PREFIX_DEFAULT(/usr/local)
+
+if test "x$prefix" = "xNONE"; then
+  prefix=$ac_default_prefix
+  ac_configure_args="$ac_configure_args --prefix $prefix"
+fi
+KDE_FAST_CONFIGURE
+KDE_CONF_FILES
+
+dnl without this order in this file, automake will be confused!
+dnl
+AM_CONFIG_HEADER(config.h)
+
+dnl checks for programs.
+dnl first check for c/c++ compilers
+AC_CHECK_COMPILERS
+
+dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
+dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
+dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
+
+dnl create only shared libtool-libraries
+AC_ENABLE_SHARED(yes)
+
+dnl set the following to yes, if you want to create static
+dnl libtool-libraries, too.
+AC_ENABLE_STATIC(no)
+
+dnl create a working libtool-script
+KDE_PROG_LIBTOOL
+
+dnl activate the next macro call for DLOPEN tests and setting LIBDL
+dnl   (n.b. KDE_MISC_TESTS does the same to you, so use either this or the next one)
+dnl KDE_CHECK_DLOPEN
+
+dnl activate the next macro call for some additional tests
+dnl   (compat, crypt, socket, nsl, dlopen, ...)
+dnl KDE_MISC_TESTS dnl __kdevelop__
+
+dnl KDE_NEED_FLEX dnl __kdevelop__
+dnl AC_PROG_YACC dnl __kdevelop__
+
+dnl KDE_CHECK_EXTRA_LIBS
+all_libraries="$all_libraries $USER_LDFLAGS"
+all_includes="$all_includes $USER_INCLUDES"
+AC_SUBST(all_includes)
+AC_SUBST(all_libraries)
+
+AC_SUBST(AUTODIRS)
+
 #AM_INIT_AUTOMAKE(taglib,1.0)
 dnl don't remove the below
-dnl AC_OUTPUT(taglib/taglib-config)
-dnl AC_OUTPUT(taglib/taglib.pc)
+dnl AC_OUTPUT(taglib-config)
+dnl AC_OUTPUT(taglib.pc)
 
 AC_DEFUN([AC_HAVE_ZLIB],
 [
-	AC_DEFINE(HAVE_ZLIB, 1, [have zlib])
-	have_zlib=true
+        AC_DEFINE(HAVE_ZLIB, 1, [have zlib])
+        have_zlib=true
 ])
 
 AC_DEFUN([AC_NO_ZLIB],
 [
-	AC_DEFINE(HAVE_ZLIB, 0, [have zlib])
-	have_zlib=false
+        AC_DEFINE(HAVE_ZLIB, 0, [have zlib])
+        have_zlib=false
 ])
 
 AC_CHECK_HEADER(zlib.h, AC_HAVE_ZLIB, AC_NO_ZLIB)