* fix libcurl dependency

git-svn-id: trunk@6570 -

utils/fppkg/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/02/20]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -237,7 +237,6 @@ FCL20=fcl20
 FCL20UNITS=zstream contnrs streamcoll zipper
 else
 PKGCURL=pkglibcurl
-LIBCURL=libcurl
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=fppkg
@@ -2161,7 +2160,7 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl fcl fpmake $(LIBCURL)
+override REQUIRE_PACKAGES=rtl fcl fpmake libcurl
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -2171,7 +2170,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2186,7 +2185,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2198,7 +2197,7 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_WINUNITS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2214,7 +2213,7 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
@@ -2226,7 +2225,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2241,7 +2240,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2253,7 +2252,7 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2271,7 +2270,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -2280,7 +2279,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2290,7 +2289,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2302,7 +2301,7 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2317,7 +2316,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2330,7 +2329,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2346,7 +2345,7 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
@@ -2355,7 +2354,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2365,7 +2364,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2376,7 +2375,7 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2388,7 +2387,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2398,7 +2397,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2411,7 +2410,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2429,7 +2428,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2446,7 +2445,7 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2461,7 +2460,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2471,7 +2470,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2483,7 +2482,7 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2498,7 +2497,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2508,7 +2507,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2521,7 +2520,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2538,7 +2537,7 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2553,7 +2552,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2563,7 +2562,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2576,7 +2575,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2591,7 +2590,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2601,7 +2600,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2614,7 +2613,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2631,7 +2630,7 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2649,7 +2648,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
@@ -2658,7 +2657,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2671,7 +2670,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2689,7 +2688,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2706,7 +2705,7 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_WINUNITS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
@@ -2715,7 +2714,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2728,7 +2727,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2743,7 +2742,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2754,7 +2753,7 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2766,7 +2765,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2776,7 +2775,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2786,7 +2785,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2796,7 +2795,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -2809,7 +2808,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
@@ -2824,7 +2823,7 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FPMAKE=1
-REQUIRE_PACKAGES_=1
+REQUIRE_PACKAGES_LIBCURL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
@@ -3036,30 +3035,30 @@ ifdef UNITDIR_FPMAKE
 override COMPILER_UNITDIR+=$(UNITDIR_FPMAKE)
 endif
 endif
-ifdef REQUIRE_PACKAGES_
-PACKAGEDIR_:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /$/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_),)
-ifneq ($(wildcard $(PACKAGEDIR_)/units/$(TARGETSUFFIX)),)
-UNITDIR_=$(PACKAGEDIR_)/units/$(TARGETSUFFIX)
+ifdef REQUIRE_PACKAGES_LIBCURL
+PACKAGEDIR_LIBCURL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libcurl/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_LIBCURL),)
+ifneq ($(wildcard $(PACKAGEDIR_LIBCURL)/units/$(TARGETSUFFIX)),)
+UNITDIR_LIBCURL=$(PACKAGEDIR_LIBCURL)/units/$(TARGETSUFFIX)
 else
-UNITDIR_=$(PACKAGEDIR_)
+UNITDIR_LIBCURL=$(PACKAGEDIR_LIBCURL)
 endif
 ifdef CHECKDEPEND
-$(PACKAGEDIR_)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_)/$(FPCMADE)
+$(PACKAGEDIR_LIBCURL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_LIBCURL) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBCURL)/$(FPCMADE)
 endif
 else
-PACKAGEDIR_=
-UNITDIR_:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /$/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_),)
-UNITDIR_:=$(firstword $(UNITDIR_))
+PACKAGEDIR_LIBCURL=
+UNITDIR_LIBCURL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libcurl/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_LIBCURL),)
+UNITDIR_LIBCURL:=$(firstword $(UNITDIR_LIBCURL))
 else
-UNITDIR_=
+UNITDIR_LIBCURL=
 endif
 endif
-ifdef UNITDIR_
-override COMPILER_UNITDIR+=$(UNITDIR_)
+ifdef UNITDIR_LIBCURL
+override COMPILER_UNITDIR+=$(UNITDIR_LIBCURL)
 endif
 endif
 ifdef REQUIRE_PACKAGES_PASJPEG

utils/fppkg/Makefile.fpc

@@ -35,7 +35,7 @@ fpcpackage=y
 fpcdir=../..
 
 [require]
-packages=fcl fpmake $(LIBCURL)
+packages=fcl fpmake libcurl
 
 [prerules]
 # Compatibility to compile with 2.0.x
@@ -44,7 +44,6 @@ FCL20=fcl20
 FCL20UNITS=zstream contnrs streamcoll zipper
 else
 PKGCURL=pkglibcurl
-LIBCURL=libcurl
 endif
 
 [rules]