| 1 | Fixes an incompatibility with Libtool 2+.
|
| 2 |
|
| 3 | Rebased on FreeSOLID-2.1.2.
|
| 4 |
|
| 5 | Originally retrieved from Fedora (see:
|
| 6 | https://src.fedoraproject.org/rpms/FreeSOLID/raw/rawhide/f/FreeSOLID-2.1.1-configure.patch).
|
| 7 |
|
| 8 | Upstream-status: https://sourceforge.net/p/freesolid/patches/10/
|
| 9 |
|
| 10 | |
| 11 | |
| 12 | @@ -1,8 +1,11 @@
|
| 13 | dnl Process this file with autoconf to produce a configure script.
|
| 14 | -AC_INIT(sample/sample.cpp)
|
| 15 | +AC_INIT
|
| 16 | AC_CONFIG_MACRO_DIR([m4])
|
| 17 | +AC_CONFIG_SRCDIR([sample/sample.cpp])
|
| 18 |
|
| 19 | -AC_CANONICAL_SYSTEM
|
| 20 | +AC_CONFIG_MACRO_DIR([m4])
|
| 21 | +
|
| 22 | +AC_CANONICAL_TARGET
|
| 23 | PACKAGE=FreeSOLID
|
| 24 | VERSION=2.1.1
|
| 25 | FREESOLID_CURRENT=2
|
| 26 | @@ -15,15 +18,14 @@
|
| 27 |
|
| 28 | AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
| 29 |
|
| 30 | -AM_CONFIG_HEADER(include/config.h)
|
| 31 | +AC_CONFIG_HEADERS([include/config.h])
|
| 32 |
|
| 33 | dnl Checks for programs.
|
| 34 | -AC_LIBTOOL_WIN32_DLL
|
| 35 | AC_PROG_CXX
|
| 36 | AC_PROG_CC
|
| 37 | AC_PROG_CPP
|
| 38 | AC_PROG_INSTALL
|
| 39 | -AC_PROG_LIBTOOL
|
| 40 | +LT_INIT([win32-dll])
|
| 41 |
|
| 42 | CPPFLAGS="$CPPFLAGS -I../include -I./include -I. -I../libbroad -I../libmoto"
|
| 43 | AC_SUBST(CPPFLAGS)
|
| 44 | @@ -52,11 +54,6 @@
|
| 45 | AC_CHECK_FUNCS(sqrt)
|
| 46 | AC_CHECK_FUNCS(fabs)
|
| 47 |
|
| 48 | -AC_OUTPUT([ doc/Makefile
|
| 49 | - sample/Makefile
|
| 50 | - Makefile
|
| 51 | - libbroad/Makefile
|
| 52 | - libmoto/Makefile
|
| 53 | - libsolid/Makefile
|
| 54 | - freesolid-config
|
| 55 | - FreeSOLID.pc])
|
| 56 | +AC_CONFIG_FILES([doc/Makefile sample/Makefile Makefile libbroad/Makefile libmoto/Makefile libsolid/Makefile freesolid-config])
|
| 57 | +AC_CONFIG_FILES([FreeSOLID.pc])
|
| 58 | +AC_OUTPUT
|