API tools faq
paste
Advertisement
dominus

Untitled

dominus
Sep 3rd, 2023
1,444
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 19.32 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/configure.ac b/configure.ac
  2. index 85559d7f7..e107d05f0 100644
  3. --- a/configure.ac
  4. +++ b/configure.ac
  5. @@ -428,26 +428,6 @@ if test x$enable_android_apk = xno -a x$enable_exult = xyes; then
  6.     PKG_CHECK_MODULES(OGG, ogg >= 1.0 vorbis >= 1.0.1 vorbisfile, , AC_MSG_ERROR([*** must have Ogg/Vorbis installed!]))
  7.  fi
  8.  
  9. -# ---------------------------------------------------------------------
  10. -# Icu (for ES)
  11. -# ---------------------------------------------------------------------
  12. -
  13. -if test x$enable_android_apk = xno; then
  14. -   PKG_CHECK_MODULES(ICU, icu-uc, have_icu=yes, have_icu=no)
  15. -fi
  16. -
  17. -# ---------------------------------------------------------------------
  18. -# Gtk (for ES)
  19. -# ---------------------------------------------------------------------
  20. -
  21. -PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16, have_gtk=yes, have_gtk=no)
  22. -
  23. -# ---------------------------------------------------------------------
  24. -# Gdk-Pixbuf (for Gnome shp thumbnailer)
  25. -# ---------------------------------------------------------------------
  26. -
  27. -PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0, have_gdk_pixbuf=yes, have_gdk_pixbuf=no)
  28. -
  29.  # ---------------------------------------------------------------------
  30.  # Black magic for static linking.
  31.  # ---------------------------------------------------------------------
  32. @@ -589,7 +569,6 @@ fi
  33.  
  34.  
  35.  # zipped savegame support
  36. -
  37.  AC_ARG_ENABLE(zip-support, AS_HELP_STRING([--enable-zip-support], [Enable zipped savegame support @<:@default yes@:>@]),,enable_zip_support=yes)
  38.  
  39.  if test x$enable_zip_support = xyes ; then
  40. @@ -668,7 +647,6 @@ else
  41.  fi
  42.  
  43.  # Midi Sfx
  44. -
  45.  AC_ARG_ENABLE(midi-sfx, AS_HELP_STRING([--enable-midi-sfx], [Support for Midi Sfx (sounds horrible) @<:@default no@:>@]),,enable_midi_sfx=no)
  46.  AC_MSG_CHECKING([whether to enable midi sfx])
  47.  if test x$enable_midi_sfx = xyes; then
  48. @@ -679,8 +657,63 @@ else
  49.  fi
  50.  
  51.  # ---------------------------------------------------------------------
  52. -# support for Exult Studio
  53. +# Exult Studio
  54.  # ---------------------------------------------------------------------
  55. +
  56. +AC_ARG_ENABLE(exult-studio, AS_HELP_STRING([--enable-exult-studio], [Build Exult Studio @<:@default no@:>@]),,enable_exult_studio=no)
  57. +AC_MSG_CHECKING([whether to build Exult Studio])
  58. +
  59. +if test x$enable_android_apk = xyes; then
  60. +   enable_exult_studio=no
  61. +fi
  62. +
  63. +# library dependencies
  64. +if test x$enable_exult_studio = xyes; then
  65. +# Icu
  66. +   PKG_CHECK_MODULES(ICU, icu-uc, have_icu=yes, have_icu=no)
  67. +# Gtk
  68. +   PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16, have_gtk=yes, have_gtk=no)
  69. +# Freetype2 (optional, used in ExultStudio, shapes/fontgen.cc)
  70. +   AC_PATH_PROG(FT2CONFIG, freetype-config)
  71. +   if test -n "$FT2CONFIG"; then
  72. +       FREETYPE2_LIBS=`$FT2CONFIG --libs`
  73. +       SAVED_LDFLAGS="$LDFLAGS"
  74. +       LDFLAGS="$LDFLAGS $FREETYPE2_LIBS"
  75. +       AC_CHECK_FUNC(FT_Init_FreeType, have_freetype=yes, have_freetype=no)
  76. +       LDFLAGS="$SAVED_LDFLAGS"
  77. +       FREETYPE2_INCLUDES=`$FT2CONFIG --cflags`
  78. +       if test x$have_freetype = xyes; then
  79. +           AC_DEFINE(HAVE_FREETYPE2, 1, [Have freetype2])
  80. +       else
  81. +           FREETYPE2_LIBS=
  82. +           FREETYPE2_INCLUDES=
  83. +       fi
  84. +       AC_SUBST(FREETYPE2_LIBS)
  85. +       AC_SUBST(FREETYPE2_INCLUDES)
  86. +   fi
  87. +fi
  88. +
  89. +# Exult Studio
  90. +if test x$enable_exult_studio = xyes; then
  91. +   AC_MSG_RESULT(yes)
  92. +   if test x$have_gtk = xno; then
  93. +       echo "Exult Studio requires the GTK+ (aka the GIMP Tool Kit), but it is not installed."
  94. +       echo "Please try again, either with the GTK+ installed as 3.16 or newer, or with '--disable-exult-studio'."
  95. +       exit 1
  96. +   fi
  97. +   if test x$have_icu = xno; then
  98. +       echo "Exult Studio requires the ICU (aka the International Components for Unicode), but it is not installed."
  99. +       echo "Please try again, either with the ICU installed, or with '--disable-exult-studio'."
  100. +       exit 1
  101. +   fi
  102. +   AM_CONDITIONAL(BUILD_STUDIO, true)
  103. +   AM_CONDITIONAL(BUILD_SHAPES, true)
  104. +else
  105. +   AM_CONDITIONAL(BUILD_STUDIO, false)
  106. +   AC_MSG_RESULT(no)
  107. +fi
  108. +
  109. +# support for Exult Studio
  110.  AC_MSG_CHECKING([whether to enable support for Exult Studio])
  111.  AC_ARG_ENABLE(exult-studio-support, AS_HELP_STRING([--enable-exult-studio-support], [Enable ExultStudio support @<:@default no@:>@]),,enable_exult_studio_support=no)
  112.  if test "$WINDOWING_SYSTEM" != -DXWIN -a "$WINDOWING_SYSTEM" != -D_WIN32 -a "$WINDOWING_SYSTEM" != -DMACOSX; then
  113. @@ -692,6 +725,10 @@ if test "$WINDOWING_SYSTEM" != -DMACOSX; then
  114.     enable_macosx_x11_studio_support=no
  115.  fi
  116.  
  117. +if test x$enable_exult_studio = xyes; then
  118. +   enable_exult_studio_support=yes
  119. +fi
  120. +
  121.  if test x$enable_exult_studio_support = xyes ; then
  122.     AC_MSG_RESULT(yes)
  123.     AC_DEFINE(USE_EXULTSTUDIO, 1, [Use Exult Studio])
  124. @@ -719,6 +756,152 @@ else
  125.     AC_MSG_RESULT(no)
  126.  fi
  127.  
  128. +# ---------------------------------------------------------------------
  129. +# External features
  130. +# ---------------------------------------------------------------------
  131. +
  132. +# Build any external programs?
  133. +AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools], [Only build the main program]),,enable_tools=yes)
  134. +AC_MSG_CHECKING([whether to build only the main program])
  135. +if test x$enable_tools = xno; then
  136. +   AC_MSG_RESULT(yes)
  137. +   AM_CONDITIONAL(BUILD_TOOLS, false)
  138. +   enable_gimp_plugin=no
  139. +   enable_compiler=no
  140. +else
  141. +   AM_CONDITIONAL(BUILD_TOOLS, true)
  142. +   AC_MSG_RESULT(no)
  143. +fi
  144. +
  145. +# Build compiler?
  146. +AC_ARG_ENABLE(compiler, AS_HELP_STRING([--enable-compiler], [Build the usecode compiler @<:@default no@:>@]),,enable_compiler=no)
  147. +AC_MSG_CHECKING([whether to build the usecode compiler])
  148. +if test x$enable_compiler = xno; then
  149. +   AC_MSG_RESULT(no)
  150. +   AM_CONDITIONAL(BUILD_COMPILER, false)
  151. +else
  152. +   AC_MSG_RESULT(yes)
  153. +   AM_CONDITIONAL(BUILD_COMPILER, true)
  154. +fi
  155. +
  156. +# Build data files?
  157. +AC_ARG_ENABLE(data, AS_HELP_STRING([--enable-data], [Create the data files @<:@default yes@:>@]),,enable_data=yes)
  158. +AC_MSG_CHECKING([whether to build the data files])
  159. +if test x$enable_data = xno; then
  160. +   AC_MSG_RESULT(no)
  161. +   AM_CONDITIONAL(DATA_FILES, false)
  162. +else
  163. +   AM_CONDITIONAL(DATA_FILES, true)
  164. +   AC_MSG_RESULT(yes)
  165. +fi
  166. +
  167. +# Build mods?
  168. +AC_ARG_ENABLE(mods, AS_HELP_STRING([--enable-mods], [Build the Exult mods (requires usecode compiler) @<:@default no@:>@]),,enable_mods=no)
  169. +AC_MSG_CHECKING([whether to build the Exult mods])
  170. +if test x$enable_mods = xno -o x$enable_compiler = xno; then
  171. +   AC_MSG_RESULT(no)
  172. +   AM_CONDITIONAL(BUILD_MODS, false)
  173. +else
  174. +   AM_CONDITIONAL(BUILD_MODS, true)
  175. +   AC_MSG_RESULT(yes)
  176. +fi
  177. +
  178. +# Usecode debugger
  179. +AC_ARG_WITH([usecode-debugger],
  180. +            AS_HELP_STRING([--with-usecode-debugger=no|console|yes],
  181. +                           [Experimental and buggy support for usecode debugging @<:@default no@:>@]),
  182. +            [enable_usecode_debugger="$withval"], [enable_usecode_debugger="no"])
  183. +AC_MSG_CHECKING([whether to enable the usecode debugger])
  184. +if test x$enable_usecode_debugger = xconsole -o x$enable_usecode_debugger = xyes; then
  185. +   AC_MSG_RESULT(yes)
  186. +   if test x$enable_usecode_debugger = xconsole; then
  187. +       AC_DEFINE(USECODE_CONSOLE_DEBUGGER, 1, [Enable Usecode debugging on console])
  188. +   elif test x$enable_exult_studio != xyes; then
  189. +       echo "But we are not building Exult Studio."
  190. +       echo "Try again, either with --enable-exult-studio, or without the usecode debugger"
  191. +       exit 1
  192. +   elif test x$enable_exult_studio_support != xyes; then
  193. +       echo "But we are not building Exult with Exult Studio support."
  194. +       echo "Try again, either with --enable-exult-studio-support, or without the usecode debugger"
  195. +       exit 1
  196. +   fi
  197. +   AC_DEFINE(USECODE_DEBUGGER, 1, [Enable Usecode debugging])
  198. +else
  199. +   AC_MSG_RESULT(no)
  200. +fi
  201. +
  202. +# Usecode container
  203. +AC_ARG_ENABLE(usecode-container, AS_HELP_STRING([--enable-usecode-container], [Enable display of usecode container for debugging purposes @<:@default no@:>@]),,enable_usecode_container=no)
  204. +AC_MSG_CHECKING([whether to display the usecode container in Gumps])
  205. +if test x$enable_usecode_container = xyes; then
  206. +   AC_MSG_RESULT(yes)
  207. +   AC_DEFINE(SHOW_USECODE_CONTAINER, 1, [Display Usecode container])
  208. +else
  209. +   AC_MSG_RESULT(no)
  210. +fi
  211. +
  212. +# Show non-readied objects
  213. +AC_ARG_ENABLE(nonreadied-objects, AS_HELP_STRING([--enable-nonreadied-objects], [Enable display of non-readied objects for debugging purposes @<:@default no@:>@]),,enable_nonreadied_objects=no)
  214. +AC_MSG_CHECKING([whether to display non-readied objects in Gumps])
  215. +if test x$enable_nonreadied_objects = xyes; then
  216. +   AC_MSG_RESULT(yes)
  217. +   AC_DEFINE(SHOW_NONREADIED_OBJECTS, 1, [Display non-readied objects])
  218. +else
  219. +   AC_MSG_RESULT(no)
  220. +fi
  221. +
  222. +# gnome-shp-thumbnailer
  223. +AC_ARG_ENABLE(gnome-shp-thumbnailer, AS_HELP_STRING([--enable-gnome-shp-thumbnailer], [Build Gnome SHP Thumbnailer @<:@default no@:>@]),,enable_gnome_shp_thumbnailer=no)
  224. +AC_MSG_CHECKING([whether to build the Gnome SHP Thumbnailer])
  225. +if test x$enable_gnome_shp_thumbnailer = xyes; then
  226. +   AC_MSG_RESULT(yes)
  227. +   # needs Gdk-Pixbuf
  228. +   PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0, have_gdk_pixbuf=yes, have_gdk_pixbuf=no)
  229. +   if test x$have_gdk_pixbuf = xno; then
  230. +       echo "Umm, but we don't have any Gdk-Pixbuf stuff."
  231. +       echo "Try again, either with Gdk-Pixbuf-2.0, or with --disable-gnome-shp-thumbnailer"
  232. +       exit 1
  233. +   fi
  234. +   AM_CONDITIONAL(BUILD_GTHUMB, true)
  235. +else
  236. +   AM_CONDITIONAL(BUILD_GTHUMB, false)
  237. +   AC_MSG_RESULT(no)
  238. +fi
  239. +
  240. +# GIMP plugin
  241. +AM_CONDITIONAL(GIMP_PLUGIN, false)
  242. +AC_ARG_ENABLE(gimp-plugin, AS_HELP_STRING([--enable-gimp-plugin], [Build the GIMP plugin @<:@default no@:>@]),,enable_gimp_plugin=no)
  243. +AC_MSG_CHECKING([whether to build the GIMP plugin])
  244. +if test x$enable_gimp_plugin = xyes; then
  245. +   AC_MSG_RESULT(yes)
  246. +   AC_MSG_CHECKING([for gimptool])
  247. +   AC_CHECK_PROGS(GIMPTOOL, gimptool-2.0)
  248. +   if test -z "$GIMPTOOL"; then
  249. +       AC_MSG_RESULT([no, not building GIMP plugin])
  250. +   else
  251. +       AC_MSG_CHECKING([for GIMP version])
  252. +       gimp_version=`$GIMPTOOL --version`
  253. +       AX_COMPARE_VERSION([$gimp_version], [ge], [2.8.0], [dnl
  254. +           dnl $gimp_version >= 2.8.0
  255. +           AC_MSG_RESULT([found $gimp_version >= 2.8.0])
  256. +           AC_SUBST(GIMPTOOL)
  257. +           AM_CONDITIONAL(GIMP_PLUGIN, true)
  258. +           GIMP_PLUGIN_PREFIX=`$GIMPTOOL --gimpplugindir`
  259. +           GIMP_PLUGIN_PREFIX="$GIMP_PLUGIN_PREFIX/plug-ins"
  260. +           AC_SUBST(GIMP_PLUGIN_PREFIX)
  261. +           AC_DEFINE(HAVE_GIMP, 1, [Have GIMP])
  262. +           GIMP_INCLUDES=`$PKG_CONFIG --cflags gimpui-2.0`
  263. +           GIMP_LIBS=`$PKG_CONFIG --libs gimpui-2.0`
  264. +           AC_SUBST(GIMP_INCLUDES)
  265. +           AC_SUBST(GIMP_LIBS)
  266. +       ], [
  267. +           dnl $gimp_version < 2.8.0
  268. +           AC_MSG_RESULT([found $gimp_version < 2.8.0 - disabling plugin])
  269. +       ])
  270. +   fi
  271. +else
  272. +   AC_MSG_RESULT(no)
  273. +fi
  274.  
  275.  # ---------------------------------------------------------------------
  276.  # Alternative directories
  277. @@ -934,7 +1117,6 @@ else
  278.     AC_MSG_RESULT(no)
  279.  fi
  280.  
  281. -
  282.  # ---------------------------------------------------------------------
  283.  # Warning level
  284.  # ---------------------------------------------------------------------
  285. @@ -984,196 +1166,9 @@ do
  286.     AX_CHECK_COMPILE_FLAG([$cxx_flag], [WARNINGS="$WARNINGS $cxx_flag"], [], [$DEBUG_LEVEL -Werror])
  287.  done
  288.  
  289. -
  290. -# --------------------
  291. -# External features
  292. -# --------------------
  293. -
  294. -# Build any external programs?
  295. -AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools], [Only build the main program]),,enable_tools=yes)
  296. -AC_MSG_CHECKING([whether to build only the main program])
  297. -if test x$enable_tools = xno; then
  298. -   AC_MSG_RESULT(yes)
  299. -   AM_CONDITIONAL(BUILD_TOOLS, false)
  300. -   enable_gimp_plugin=no
  301. -   enable_compiler=no
  302. -else
  303. -   AM_CONDITIONAL(BUILD_TOOLS, true)
  304. -   AC_MSG_RESULT(no)
  305. -fi
  306. -
  307. -# Build compiler?
  308. -AC_ARG_ENABLE(compiler, AS_HELP_STRING([--enable-compiler], [Build the usecode compiler @<:@default no@:>@]),,enable_compiler=no)
  309. -AC_MSG_CHECKING([whether to build the usecode compiler])
  310. -if test x$enable_compiler = xno; then
  311. -   AC_MSG_RESULT(no)
  312. -   AM_CONDITIONAL(BUILD_COMPILER, false)
  313. -else
  314. -   AC_MSG_RESULT(yes)
  315. -   AM_CONDITIONAL(BUILD_COMPILER, true)
  316. -fi
  317. -
  318. -# Build data files?
  319. -AC_ARG_ENABLE(data, AS_HELP_STRING([--enable-data], [Create the data files @<:@default yes@:>@]),,enable_data=yes)
  320. -AC_MSG_CHECKING([whether to build the data files])
  321. -if test x$enable_data = xno; then
  322. -   AC_MSG_RESULT(no)
  323. -   AM_CONDITIONAL(DATA_FILES, false)
  324. -else
  325. -   AM_CONDITIONAL(DATA_FILES, true)
  326. -   AC_MSG_RESULT(yes)
  327. -fi
  328. -
  329. -# Build mods?
  330. -AC_ARG_ENABLE(mods, AS_HELP_STRING([--enable-mods], [Build the Exult mods (requires usecode compiler) @<:@default no@:>@]),,enable_mods=no)
  331. -AC_MSG_CHECKING([whether to build the Exult mods])
  332. -if test x$enable_mods = xno -o x$enable_compiler = xno; then
  333. -   AC_MSG_RESULT(no)
  334. -   AM_CONDITIONAL(BUILD_MODS, false)
  335. -else
  336. -   AM_CONDITIONAL(BUILD_MODS, true)
  337. -   AC_MSG_RESULT(yes)
  338. -fi
  339. -
  340. -# Freetype2 (optional, used in ExultStudio, shapes/fontgen.cc)
  341. -AC_PATH_PROG(FT2CONFIG, freetype-config)
  342. -if test -n "$FT2CONFIG"; then
  343. -   FREETYPE2_LIBS=`$FT2CONFIG --libs`
  344. -   SAVED_LDFLAGS="$LDFLAGS"
  345. -   LDFLAGS="$LDFLAGS $FREETYPE2_LIBS"
  346. -   AC_CHECK_FUNC(FT_Init_FreeType, have_freetype=yes, have_freetype=no)
  347. -   LDFLAGS="$SAVED_LDFLAGS"
  348. -   FREETYPE2_INCLUDES=`$FT2CONFIG --cflags`
  349. -   if test x$have_freetype = xyes; then
  350. -       AC_DEFINE(HAVE_FREETYPE2, 1, [Have freetype2])
  351. -   else
  352. -       FREETYPE2_LIBS=
  353. -       FREETYPE2_INCLUDES=
  354. -   fi
  355. -   AC_SUBST(FREETYPE2_LIBS)
  356. -   AC_SUBST(FREETYPE2_INCLUDES)
  357. -fi
  358. -
  359. -# exult-studio
  360. -AC_ARG_ENABLE(exult-studio, AS_HELP_STRING([--enable-exult-studio], [Build Exult Studio @<:@default no@:>@]),,enable_exult_studio=no)
  361. -AC_MSG_CHECKING([whether to build Exult Studio])
  362. -if test x$enable_exult_studio = xyes; then
  363. -   AC_MSG_RESULT(yes)
  364. -   if test x$have_gtk = xno; then
  365. -       echo "Exult Studio requires the GTK+ (aka the GIMP Tool Kit), but it is not installed."
  366. -       echo "Please try again, either with the GTK+ installed as 3.16 or newer, or with '--disable-exult-studio'."
  367. -       exit 1
  368. -   fi
  369. -   if test x$have_icu = xno; then
  370. -       echo "Exult Studio requires the ICU (aka the International Components for Unicode), but it is not installed."
  371. -       echo "Please try again, either with the ICU installed, or with '--disable-exult-studio'."
  372. -       exit 1
  373. -   fi
  374. -   AM_CONDITIONAL(BUILD_STUDIO, true)
  375. -   AM_CONDITIONAL(BUILD_SHAPES, true)
  376. -else
  377. -   AM_CONDITIONAL(BUILD_STUDIO, false)
  378. -   AC_MSG_RESULT(no)
  379. -fi
  380. -
  381. -# Usecode debugger
  382. -AC_ARG_WITH([usecode-debugger],
  383. -            AS_HELP_STRING([--with-usecode-debugger=no|console|yes],
  384. -                           [Experimental and buggy support for usecode debugging @<:@default no@:>@]),
  385. -            [enable_usecode_debugger="$withval"], [enable_usecode_debugger="no"])
  386. -AC_MSG_CHECKING([whether to enable the usecode debugger])
  387. -if test x$enable_usecode_debugger = xconsole -o x$enable_usecode_debugger = xyes; then
  388. -   AC_MSG_RESULT(yes)
  389. -   if test x$enable_usecode_debugger = xconsole; then
  390. -       AC_DEFINE(USECODE_CONSOLE_DEBUGGER, 1, [Enable Usecode debugging on console])
  391. -   elif test x$enable_exult_studio != xyes; then
  392. -       echo "But we are not building Exult Studio."
  393. -       echo "Try again, either with --enable-exult-studio, or without the usecode debugger"
  394. -       exit 1
  395. -   elif test x$enable_exult_studio_support != xyes; then
  396. -       echo "But we are not building Exult with Exult Studio support."
  397. -       echo "Try again, either with --enable-exult-studio-support, or without the usecode debugger"
  398. -       exit 1
  399. -   fi
  400. -   AC_DEFINE(USECODE_DEBUGGER, 1, [Enable Usecode debugging])
  401. -else
  402. -   AC_MSG_RESULT(no)
  403. -fi
  404. -
  405. -# Usecode container
  406. -AC_ARG_ENABLE(usecode-container, AS_HELP_STRING([--enable-usecode-container], [Enable display of usecode container for debugging purposes @<:@default no@:>@]),,enable_usecode_container=no)
  407. -AC_MSG_CHECKING([whether to display the usecode container in Gumps])
  408. -if test x$enable_usecode_container = xyes; then
  409. -   AC_MSG_RESULT(yes)
  410. -   AC_DEFINE(SHOW_USECODE_CONTAINER, 1, [Display Usecode container])
  411. -else
  412. -   AC_MSG_RESULT(no)
  413. -fi
  414. -
  415. -# Show non-readied objects
  416. -AC_ARG_ENABLE(nonreadied-objects, AS_HELP_STRING([--enable-nonreadied-objects], [Enable display of non-readied objects for debugging purposes @<:@default no@:>@]),,enable_nonreadied_objects=no)
  417. -AC_MSG_CHECKING([whether to display non-readied objects in Gumps])
  418. -if test x$enable_nonreadied_objects = xyes; then
  419. -   AC_MSG_RESULT(yes)
  420. -   AC_DEFINE(SHOW_NONREADIED_OBJECTS, 1, [Display non-readied objects])
  421. -else
  422. -   AC_MSG_RESULT(no)
  423. -fi
  424. -
  425. -# gnome-shp-thumbnailer
  426. -AC_ARG_ENABLE(gnome-shp-thumbnailer, AS_HELP_STRING([--enable-gnome-shp-thumbnailer], [Build Gnome SHP Thumbnailer @<:@default no@:>@]),,enable_gnome_shp_thumbnailer=no)
  427. -AC_MSG_CHECKING([whether to build the Gnome SHP Thumbnailer])
  428. -if test x$enable_gnome_shp_thumbnailer = xyes; then
  429. -   AC_MSG_RESULT(yes)
  430. -   if test x$have_gdk_pixbuf = xno; then
  431. -       echo "Umm, but we don't have any Gdk-Pixbuf stuff."
  432. -       echo "Try again, either with Gdk-Pixbuf-2.0, or with --disable-gnome-shp-thumbnailer"
  433. -       exit 1
  434. -   fi
  435. -   AM_CONDITIONAL(BUILD_GTHUMB, true)
  436. -else
  437. -   AM_CONDITIONAL(BUILD_GTHUMB, false)
  438. -   AC_MSG_RESULT(no)
  439. -fi
  440. -
  441. -# GIMP plugin
  442. -AM_CONDITIONAL(GIMP_PLUGIN, false)
  443. -AC_ARG_ENABLE(gimp-plugin, AS_HELP_STRING([--enable-gimp-plugin], [Build the GIMP plugin @<:@default no@:>@]),,enable_gimp_plugin=no)
  444. -AC_MSG_CHECKING([whether to build the GIMP plugin])
  445. -if test x$enable_gimp_plugin = xyes; then
  446. -   AC_MSG_RESULT(yes)
  447. -   AC_MSG_CHECKING([for gimptool])
  448. -   AC_CHECK_PROGS(GIMPTOOL, gimptool-2.0)
  449. -   if test -z "$GIMPTOOL"; then
  450. -       AC_MSG_RESULT([no, not building GIMP plugin])
  451. -   else
  452. -       AC_MSG_CHECKING([for GIMP version])
  453. -       gimp_version=`$GIMPTOOL --version`
  454. -       AX_COMPARE_VERSION([$gimp_version], [ge], [2.8.0], [dnl
  455. -           dnl $gimp_version >= 2.8.0
  456. -           AC_MSG_RESULT([found $gimp_version >= 2.8.0])
  457. -           AC_SUBST(GIMPTOOL)
  458. -           AM_CONDITIONAL(GIMP_PLUGIN, true)
  459. -           GIMP_PLUGIN_PREFIX=`$GIMPTOOL --gimpplugindir`
  460. -           GIMP_PLUGIN_PREFIX="$GIMP_PLUGIN_PREFIX/plug-ins"
  461. -           AC_SUBST(GIMP_PLUGIN_PREFIX)
  462. -           AC_DEFINE(HAVE_GIMP, 1, [Have GIMP])
  463. -           GIMP_INCLUDES=`$PKG_CONFIG --cflags gimpui-2.0`
  464. -           GIMP_LIBS=`$PKG_CONFIG --libs gimpui-2.0`
  465. -           AC_SUBST(GIMP_INCLUDES)
  466. -           AC_SUBST(GIMP_LIBS)
  467. -       ], [
  468. -           dnl $gimp_version < 2.8.0
  469. -           AC_MSG_RESULT([found $gimp_version < 2.8.0 - disabling plugin])
  470. -       ])
  471. -   fi
  472. -else
  473. -   AC_MSG_RESULT(no)
  474. -fi
  475. -
  476. -# ----------------------------------------------------------------
  477. -# If we are cross-compiling, look for expack and head2data in PATH
  478. -# ----------------------------------------------------------------
  479. +# ---------------------------------------------------------------------
  480. +# Cross-Compiling
  481. +# ---------------------------------------------------------------------
  482.  
  483.  AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
  484.  
  485. @@ -1200,9 +1195,9 @@ AS_IF([ test $cross_compiling = yes ], [
  486.     fi
  487.  ])
  488.  
  489. -# ------------------
  490. +# ---------------------------------------------------------------------
  491.  # Generate output
  492. -# ------------------
  493. +# ---------------------------------------------------------------------
  494.  
  495.  AC_SUBST(SDL_CFLAGS)
  496.  AC_SUBST(SDL_LIBS)
  497. @@ -1324,14 +1319,14 @@ if test x$enable_android_apk = xno; then
  498.         PKG_CHECK_EXISTS(zlib,
  499.             echo zlib....................... : `$PKG_CONFIG --modversion zlib`)
  500.     fi
  501. -   if test x$have_icu = xyes; then
  502. +   if test x$enable_exult_studio = xyes; then
  503.         echo ICU........................ : `$PKG_CONFIG --modversion icu-uc`
  504.     fi
  505. -   if test x$have_gtk = xyes; then
  506. +   if test x$enable_exult_studio = xyes; then
  507.         echo GLIB....................... : `$PKG_CONFIG --modversion glib-2.0`
  508.         echo GTK+....................... : `$PKG_CONFIG --modversion gtk+-3.0`
  509.     fi
  510. -   if test x$have_gdk_pixbuf = xyes; then
  511. +   if test x$enable_gnome_shp_thumbnailer = xyes; then
  512.         echo GDK-Pixbuf................. : `$PKG_CONFIG --modversion gdk-pixbuf-2.0`
  513.     fi
  514.     echo
  515.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!