51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
--- configure.in.orig 2016-01-15 07:06:06.724289188 +0100
|
|
+++ configure.in 2016-01-15 07:06:46.395656258 +0100
|
|
@@ -31,19 +31,6 @@ AC_MINGW32
|
|
AC_EXEEXT
|
|
AC_OBJEXT
|
|
|
|
-dnl check for cross compiler path
|
|
-if test x$cross_compiling = xyes; then
|
|
- AC_MSG_CHECKING(for cross compiler path)
|
|
- if test -d /usr/local/cross/i686-pc-cygwin; then
|
|
- CROSSCOMPPATH=/usr/local/cross/i686-pc-cygwin
|
|
- elif test -d /usr/local/cygwin/i686-pc-cygwin; then
|
|
- CROSSCOMPPATH=/usr/local/cygwin/i686-pc-cygwin
|
|
- else
|
|
- AC_ERROR("cross compiler not found")
|
|
- fi
|
|
- AC_MSG_RESULT($CROSSCOMPPATH)
|
|
-fi
|
|
-
|
|
if test x$CYGWIN != xyes -a x$MINGW32 != xyes; then
|
|
AC_CHECK_LIB(m,sqrt)
|
|
fi
|
|
@@ -137,25 +124,9 @@ if test x$CYGWIN = xyes -o x$MINGW32 = x
|
|
LIBS="$LIBS -ldsound -lgdi32"
|
|
fi
|
|
|
|
-if test x$cross_compiling = xyes; then
|
|
- gtk=no
|
|
- xlibs="$LIBS"
|
|
- LIBS="$LIBS -L$CROSSCOMPPATH/gtk/lib"
|
|
- AC_CHECK_LIB(gtk,gtk_main,gtk=yes)
|
|
- LIBS="$xlibs"
|
|
- if test x$gtk = xyes; then
|
|
- GTK_CFLAGS="-I$CROSSCOMPPATH/gtk/include -I$CROSSCOMPPATH/gtk/include/glib -I$CROSSCOMPPATH/gtk/include/gdk"
|
|
- GTK_LIBS="-L$CROSSCOMPPATH/gtk/lib -lgtk -lgdk -lglib"
|
|
- PTHREAD_CFLAGS="-I$CROSSCOMPPATH/gtk/include"
|
|
- PTHREAD_LIBS="-L$CROSSCOMPPATH/gtk/lib"
|
|
- AUDIOFILE_CFLAGS="-I$CROSSCOMPPATH/audiofile/include"
|
|
- AUDIOFILE_LIBS="-L$CROSSCOMPPATH/audiofile/lib -laudiofile"
|
|
- fi
|
|
-else
|
|
- PKG_CHECK_MODULES(XML,libxml-2.0)
|
|
- PKG_CHECK_MODULES(GTK,gtk+-2.0 >= 2.6.0)
|
|
- PKG_CHECK_MODULES(AUDIOFILE,audiofile)
|
|
-fi
|
|
+PKG_CHECK_MODULES(XML,libxml-2.0)
|
|
+PKG_CHECK_MODULES(GTK,gtk+-2.0 >= 2.6.0)
|
|
+PKG_CHECK_MODULES(AUDIOFILE,audiofile)
|
|
|
|
dnl Check for recently introduced GTK symbols
|
|
xlibs="$LIBS"
|